sigbit_admin_rails 0.0.4.1 → 0.0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9675ed0e51c8d1354dbe058973496b92c2850dc9
-  data.tar.gz: 6c3c31fc81960b815040374c0cef2197ee4c9027
+  metadata.gz: b556abf2edbfb7c7834f11e9ad574b611b8cb998
+  data.tar.gz: 711e7dd5bb3df7f21cec29de64656ba9e520d86f
 SHA512:
-  metadata.gz: 7b34efbe05abcfff6db455f5d8ac95fb022aba49416b438c48f6579110cb9283914ee0b953eb509899f527202937458e945bf27502282fb6b2f829c1bc8309c8
-  data.tar.gz: 5b45307444d9b503cea27be6c363c76421e08162acd122c65a3b29cb83d3b8487165d3768897f28791c805e8fb16416d683e7bc176df2591de5adaf8e9bbc2fd
+  metadata.gz: b9eb12310b2bbabd0d3b88cb0b409b007eb5ea19ea883a52930d0bfd63bfb8850e30b99a91543882dc20edac0436114f314d2894b3aa30d7c355a4743ad37ef7
+  data.tar.gz: 07393ef1b47659fb6e9e48f3c82c2b094d2392485c46ce29fb3760f696277f2adb1426c60153928ed0b41f85918030aa4a08670c60545b1a660701cb9bd8237e

data/assets/stylesheets/components/_header-navbar.scss

@@ -1,8 +1,8 @@
 #header-navbar {
   height: $header-navbar-height;
-  padding: $spacer/2 $spacer $spacer/2 0;
+  padding: $header-navbar-padding;
   background: $header-navbar-bg;
-  border-bottom: 1px solid $header-navbar-bottom-border;
+  border-bottom: 1px solid $header-navbar-border-color;
   -webkit-transform-style: preserve-3d;
   -moz-transform-style: preserve-3d;
   transform-style: preserve-3d;
@@ -25,8 +25,8 @@
     top: 50%;
     left: 50%;
     @include transform(translate(-50%, -50%));
-    width: 25%;
-    height: 65%;
+    width: $header-navbar-logotype-width;
+    height: $header-navbar-logotype-height;
     background: transparent url($header-navbar-logotype) no-repeat center center;
     background-size: contain;
 

data/assets/stylesheets/components/_sidebar.scss

@@ -48,29 +48,26 @@ body {
 
 .sidebar-nav {
     width: $sidebar-width;
-    margin: $spacer 0 0 0;
+    margin: $sidebar-nav-margin;
     padding: 0;
     list-style: none;
 }
 
 .sidebar-nav li {
-    text-indent: $spacer;
-    line-height: 50px;
-
-    .active {
-      color: white !important;
-    }
+    text-indent: $sidebar-nav-li-textindent;
+    line-height: $sidebar-nav-li-lineheight;
+    margin: $sidebar-nav-li-margin;
 
     a {
         position: relative;
         display: block;
         text-decoration: none;
-        color: rgba(white,0.6);
+        color: $sidebar-nav-link-color;
 
         &:hover {
             text-decoration: none;
-            color: #fff;
-            background: lighten($sidebar-bg,5%);
+            color: $sidebar-nav-link-color-hover;
+            background: $sidebar-nav-link-bg-hover;
         }
         &:active, &:focus { text-decoration: none; }
 
@@ -95,28 +92,31 @@ body {
         }
 
         &[aria-expanded="true"] {
-          background: lighten($sidebar-bg, 5%);
+          background: $sidebar-nav-link-bg-hover;
           .fa-chevron-right {
             @include transform(translateY(-50%) rotate(90deg));
           }
         }
     }
+    a.active {
+      color: $sidebar-nav-link-color-active;
+    }
 
     ul.submenu {
-      background: darken($sidebar-bg,6%);
+      background: $sidebar-nav-submenu-bg;
       padding: 0;
 
       li {
-        text-indent: $spacer*1.5;
+        text-indent: $sidebar-nav-li-textindent*1.5;
         > ul.submenu li {
-          text-indent: $spacer*2;
+          text-indent: $sidebar-nav-li-textindent*2;
         }
           a[aria-expanded="true"] {
-            background: darken($sidebar-bg,3%);
+            background: $sidebar-nav-submenu-link-bg-hover;
           }
       }
       a:hover {
-        background: darken($sidebar-bg,3%);
+        background: $sidebar-nav-submenu-link-bg-hover;
       }
     }
 
@@ -127,9 +127,9 @@ body {
   display: block;
   width: 100%;
   height: $header-navbar-height;
-  background: darken($sidebar-bg,5%) url($sidebar-logotype) no-repeat $spacer center;
-  background-size: auto 50%;
-  border-bottom: 1px solid darken($sidebar-bg,25%);
+  background: $sidebar-brand-bg url($sidebar-logotype) no-repeat $sidebar-logotype-position;
+  background-size: $sidebar-logotype-size;
+  border-bottom: 1px solid $sidebar-brand-border-color;
 }
 
 

data/assets/stylesheets/components/action-toolbar.scss

@@ -1,6 +1,6 @@
 .action-toolbar {
   position: relative;
-  padding: $navbar-padding-horizontal 0;
+  padding: $action-toolbar-padding;
   @include clearfix;
 
   > * {

data/assets/stylesheets/style.scss

@@ -0,0 +1,16 @@
+@import 'bourbon';
+@import 'variables';
+@import "node_modules/bootstrap/scss/bootstrap";
+
+@import 'mixins/nestable';
+
+@import 'components/header-navbar';
+@import 'components/sidebar';
+@import 'components/page-header';
+@import 'components/card';
+@import 'components/btn-circle';
+@import 'components/small-action-btns';
+@import 'components/action-toolbar';
+@import 'components/file-input';
+@import 'components/nestable';
+@import 'components/sortable';

data/assets/stylesheets/variables.scss

@@ -673,16 +673,45 @@ $pre-scrollable-max-height:   340px !default;
 // Logotypes
 // On mobile the sidebar logotype is replaced with the header navbar logotype
 
-$sidebar-logotype: 'http://d1i5cf397ceebi.cloudfront.net/assets/main_logo-4ab62363897ec9168acbb5507e91e7db4910b8006237f4b1be1fb06339a0395a.png'!default;
-$header-navbar-logotype: 'http://www.significantbit.se/assets/logotype-2b1fd527c1bed395289dcef8bdf490100f0c3303786007178694802beb83fbc8.svg'!default;
+$sidebar-logotype:                  "http://www.significantbit.se/assets/logotype-2b1fd527c1bed395289dcef8bdf490100f0c3303786007178694802beb83fbc8.svg" !default;
+$sidebar-logotype-position:         $spacer center !default;
+$sidebar-logotype-size:             auto 50% !default;
+
+$header-navbar-logotype:            $sidebar-logotype !default;
+$header-navbar-logotype-width:      25% !default;
+$header-navbar-logotype-height:     65% !default;
+
 
 // Sidebar
 
-$sidebar-width:   250px!default;
-$sidebar-bg:      #2d2f40!default;
+$sidebar-bg:                        #2d2f40 !default;
+$sidebar-brand-bg:                  darken($sidebar-bg,5%) !default;
+$sidebar-brand-border-color:        darken($sidebar-brand-bg,25%) !default;
+
+$sidebar-width:                     250px !default;
+
+$sidebar-nav-margin:                $spacer 0 0 0 !default;
+$sidebar-nav-li-margin:             0 !default;
+$sidebar-nav-li-lineheight:         50px !default;
+$sidebar-nav-li-textindent:         $spacer !default;
+
+$sidebar-nav-link-color:            rgba(white,0.6) !default;
+$sidebar-nav-link-color-hover:      white !default;
+$sidebar-nav-link-bg-hover:         lighten($sidebar-bg,5%) !default;
+$sidebar-nav-link-color-active:     white !default;
+
+$sidebar-nav-submenu-bg:            darken($sidebar-bg,6%) !default;
+$sidebar-nav-submenu-link-bg-hover: darken($sidebar-bg,3%) !default;
+
 
 // Header-navbar
 
-$header-navbar-height:          60px!default;
-$header-navbar-bg:              white!default;
-$header-navbar-bottom-border:   darken($gray-lighter,10%)!default;
+$header-navbar-height:          60px !default;
+$header-navbar-padding:         $spacer/2 $spacer $spacer/2 0 !default;
+$header-navbar-bg:              white !default;
+$header-navbar-border-color:    darken($gray-lighter,10%) !default; // border-color ist för bottom-border
+
+
+// Action toolbar
+
+$action-toolbar-padding: $spacer 0 !default;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sigbit_admin_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.4.2
 platform: ruby
 authors:
 - Ante Wall
@@ -62,6 +62,7 @@ files:
 - assets/stylesheets/components/sortable.scss
 - assets/stylesheets/mixins/nestable.scss
 - assets/stylesheets/sigbit-admin.scss
+- assets/stylesheets/style.scss
 - assets/stylesheets/variables.scss
 - lib/sigbit_admin_rails.rb
 - lib/sigbit_admin_rails/helpers/application_helper.rb