Merge pull request #40 from thisissoon/feature/minor-fixes

Fix: styling amends
thisissoon · Feb 13, 2015 · 50eabbd · 50eabbd
2 parents 136fadc + 218ef01
commit 50eabbd
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 9 deletions.
diff --git a/app/less/default/modules/loading.less b/app/less/default/modules/loading.less
@@ -42,4 +42,10 @@
     }
 }
 
+.project-view {
 
+    .loading .loading-icon {
+        top: 192px;
+    }
+
+}
diff --git a/app/less/main.less b/app/less/main.less
@@ -47,8 +47,8 @@
 @import "default/core/grid.less";
 @import "default/core/icons.less";
 @import "default/core/buttons.less";
-@import "default/core/utilities.less";
 @import "default/core/scaffolding.less";
+@import "default/core/utilities.less";
 
 @import "default/modules/header.less";
 @import "default/modules/project-list.less";

diff --git a/app/less/mobile/modules/header.less b/app/less/mobile/modules/header.less
@@ -8,7 +8,7 @@
 
     .brand {
         margin-top: 20px;
-        margin-left: 20px;
+        margin-left: 15px;
 
         svg { height: 45px; }
     }

diff --git a/app/less/mobile/modules/loading.less b/app/less/mobile/modules/loading.less
@@ -4,9 +4,21 @@
  *  @description    Loading screen to appear when changing views
  */
  .loading {
+
     .loading-icon {
-        left: 40px;
+        left: 20px;
         height: 45px;
-        top: 20px;
+        top: 15px;
+        width: 125px;
     }
+
  }
+
+.project-view {
+
+    .loading .loading-icon {
+        top: 15px;
+    }
+
+}
+
diff --git a/app/less/tablet/modules/header.less b/app/less/tablet/modules/header.less
@@ -8,7 +8,7 @@
 
     .brand {
         margin-top: 20px;
-        margin-left: 40px;
+        margin-left: 35px;
 
         svg { height: 45px; }
     }

diff --git a/app/less/tablet/modules/loading.less b/app/less/tablet/modules/loading.less
@@ -4,9 +4,20 @@
  *  @description    Loading screen to appear when changing views
  */
  .loading {
+
     .loading-icon {
         left: 40px;
         height: 45px;
-        top: 20px;
+        top: 15px;
+        width: 125px;
     }
+
  }
+
+.project-view {
+
+    .loading .loading-icon {
+        top: 15px;
+    }
+
+}
diff --git a/app/partials/navbar.html b/app/partials/navbar.html
@@ -10,7 +10,7 @@
     </div>
 
     <div class="row">
-        <div class="col-lg-6 col-lg-offset-4 col-md-6 col-md-offset-4 col-sm-6 col-sm-offset-2 col-xs-12 col-xs-offset-0">
+        <div class="col-lg-6 col-lg-offset-4 col-md-6 col-md-offset-4 col-sm-12 col-sm-offset-0 col-xs-12 col-xs-offset-0">
 
             <div class="collapse navbar-collapse" ng-if="!cache.get('projectView')">
                 <ul class="nav navbar-nav" du-spy-context>

diff --git a/app/partials/project-description.html b/app/partials/project-description.html
@@ -1,4 +1,4 @@
-<div class="content container-fluid">
+<div class="content padding-bottom container-fluid">
     <div class="row">
         <div class="col-lg-8  col-lg-offset-4  col-md-8  col-md-offset-4  col-sm-12  col-sm-offset-0  col-xs-12  col-xs-offset-0">
             <h2 class="section-heading">{{ project.description_headline }}</h2>

diff --git a/app/partials/project-hero.html b/app/partials/project-hero.html
@@ -1,4 +1,4 @@
-<div class="content container-fluid">
+<div class="content padding-bottom container-fluid">
 
     <div class="row">
         <div class="col-lg-2 col-md-2 hidden-sm hidden-xs">