diff options
| author | Erling Aaby <spa440w@gmail.com> | 2013-04-24 14:26:33 +0200 |
|---|---|---|
| committer | Erling Aaby <spa440w@gmail.com> | 2013-04-24 14:26:33 +0200 |
| commit | b7e3c00f6e5758cb588a87c4d1417d65da7dcff8 (patch) | |
| tree | e2bf41e927a582ef841fc5352309b9c91df654f7 | |
| parent | NAVbar changes, deleted video description, add marketbtn (diff) | |
| parent | adding support for responsive design (diff) | |
| download | Divid-b7e3c00f6e5758cb588a87c4d1417d65da7dcff8.tar.gz | |
Merge branch 'master' of https://github.com/dennisse/Divid
| -rw-r--r-- | public/css/bootstrap-responsive.less (renamed from public/css/bootstrapless/responsive.less) | 12 | ||||
| -rw-r--r-- | views/header.ejs | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/public/css/bootstrapless/responsive.less b/public/css/bootstrap-responsive.less index b8366de..c242609 100644 --- a/public/css/bootstrapless/responsive.less +++ b/public/css/bootstrap-responsive.less @@ -19,30 +19,30 @@ // Required since we compile the responsive stuff separately @import "variables.less"; // Modify this for custom colors, font-sizes, etc -@import "mixins.less"; +@import "bootstrapless/mixins.less"; // RESPONSIVE CLASSES // ------------------ -@import "responsive-utilities.less"; +@import "bootstrapless/responsive-utilities.less"; // MEDIA QUERIES // ------------------ // Large desktops -@import "responsive-1200px-min.less"; +@import "bootstrapless/responsive-1200px-min.less"; // Tablets to regular desktops -@import "responsive-768px-979px.less"; +@import "bootstrapless/responsive-768px-979px.less"; // Phones to portrait tablets and narrow desktops -@import "responsive-767px-max.less"; +@import "bootstrapless/responsive-767px-max.less"; // RESPONSIVE NAVBAR // ------------------ // From 979px and below, show a button to toggle navbar contents -@import "responsive-navbar.less"; +@import "bootstrapless/responsive-navbar.less"; diff --git a/views/header.ejs b/views/header.ejs index ceaed0d..f0185cb 100644 --- a/views/header.ejs +++ b/views/header.ejs @@ -8,8 +8,8 @@ <meta name="description" content="" /> <meta name="author" content=""> - <meta name="viewport" content="width=device-width" /> + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <link rel="stylesheet" href="/css/bootstrap.css" /> + <link rel="stylesheet" href="/css/bootstrap-responsive.css"> <link rel="stylesheet" href="/css/styles.css" /> - <link rel="stylesheet" href="/css/devanim.css"> |