captive-admin 0.1.0.alpha → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de70928a6c6a5f945fd2e3cb6fc87625ee195df6188760346a8409af948f3dec
-  data.tar.gz: 5976a7d3d9b960a6c112e0cc78ed56f1a4156cff2fc28e29d12e8c8633ba5620
+  metadata.gz: 47a27396c1892618e93b00a44b4094d7cde66d44e0f78beb2e887061d386ab0f
+  data.tar.gz: a8f35d01b61ba43e0a742483b8feed22cca84ab7f56caa073021dd4b834fade9
 SHA512:
-  metadata.gz: 4dda41f7c744488109b1eb258b051990a9b2715b3274299d7fdea0bd1466174b09f16be5f5c2d474006393a005352ccafa667f4c86b07c7db364b98d43300728
-  data.tar.gz: 93d3ba75fd9d5cfc5eb653345118d49738b4c50a53f7716382c86a8ad92d8e1708cdc77d1ee862e2ef51ed8afbc3255d831b54719b60f62849a764721a09a3d5
+  metadata.gz: 5eb581360dc7dd86cd7d4302ce013cda1a3654803db0dbe05c1018a6c8f6d6880110a71ceb09631f379c54cb3ad5be5f99fbefe17e7371e4f0f59fa61fdd13d9
+  data.tar.gz: 2daa72c05c5af576e59696b27ca1190bdfe31a0536edbe24799623a9fa40dcca4b8fbcc6eeee5f85899c1e740c89a056b72e70e9af454d8485c91f75874deffa

data/app/assets/stylesheets/captive-admin/_base.scss

@@ -7,10 +7,12 @@
   @import './header';
   @import './forms';
   @import './components/tables';
+  @import './components/breadcrumbs';
   @import './components/links';
   @import './components/panels';
   @import './components/status_tags';
   @import './pages/logged_out';
+  @import './structure/main_structure';
   @import './structure/title_bar';
 
   body {

data/app/assets/stylesheets/captive-admin/_header.scss

@@ -1,34 +1,121 @@
 // ----------------------------------- Header
+@mixin down-arrow {
+  background-image: url($menu-arrow-light-icon-url);
+  background-size: 24px;
+  background-position-x: calc(100% - 4px);
+  padding-right: 28px;
+}
+
 #header {
   text-shadow: none;
   background: $bg-emphasis;
+  padding: 0 $spacer-6;
 
   h1 {
     color: $fg-on-emphasis;
+    padding-left: 0;
+    height: 60px;
+    display: flex;
+    align-items: center;
+
+    img {
+      top: 0;
+      height: 24px;
+    }
   }
 
   a,
   a:link {
-    color: $fg-on-emphasis;
+    color: $blue-grey-100;
+  }
+
+  .header-item {
+    top: 0;
   }
 
   ul.tabs {
+    li {
+      &:hover > ul {
+        display: block;
+        margin-top: $spacer-2;
+        padding: $spacer-3 0;
+      }
+    }
+
     & > li {
+      font-size: $f5;
+
       &.current > a {
-        background: $accent-subtle;
-        color: $fg-default;
+        background: none;
+
+        &::before {
+          content: '';
+          background-color: $primary-emphasis;
+          position: absolute;
+          bottom: 0;
+          width: 19px;
+          height: 2px;
+          left: 50%;
+          margin-left: -9px;
+        }
+      }
+
+      &.has_nested > a {
+        @include down-arrow;
+      }
+
+      &.has_nested.current > a {
+        @include down-arrow;
+
+        background-color: transparent;
+      }
+
+      a {
+        padding: $spacer-2 $spacer-3;
+        font-weight: bold;
+        border-radius: 20px;
       }
 
       &:hover > a {
-        background: $accent-subtle;
-        color: $accent-fg;
+        background: $blue-grey-700;
+      }
+
+      &.has_nested:hover > a {
+        @include rounded-all(20px, 20px, 20px, 20px);
+        @include down-arrow;
+
+        border-bottom: none;
+        background-color: $blue-grey-700;
+      }
+
+      /* Drop down menus */
+      ul {
+        background: $bg-default;
+        @include rounded-all(12px, 12px, 12px, 12px);
+
+        text-align: left;
+        @include shadow-xs;
+
+        li {
+          a {
+            color: $fg-default;
+
+            &:hover {
+              background: $bg-subtle;
+              color: $fg-default;
+              border-radius: 0;
+            }
+          }
+        }
       }
     }
   }
 
+  #tabs {
+    text-align: center;
+  }
+
   #utility_nav {
-    a:hover {
-      color: $accent-fg;
-    }
+    padding-right: 0;
   }
 }

data/app/assets/stylesheets/captive-admin/_typography.scss

@@ -11,6 +11,7 @@ h5,
 h6 {
   @include title-family;
 
+  color: $fg-default;
   letter-spacing: 0.5px;
   margin-top: 0;
 }

data/app/assets/stylesheets/captive-admin/components/_breadcrumbs.scss

@@ -0,0 +1,18 @@
+.breadcrumb {
+  @include body-medium;
+
+  text-transform: none;
+  margin-bottom: 0;
+
+  a,
+  a:link,
+  a:visited,
+  a:active {
+    color: $fg-subtle;
+  }
+
+  .breadcrumb_sep {
+    color: $primary-fg;
+    font-weight: bold;
+  }
+}

data/app/assets/stylesheets/captive-admin/mixins/_typography.scss

@@ -9,3 +9,13 @@
 @mixin title-family {
   font-family: $title-font-family;
 }
+
+@mixin body-medium {
+  font-size: $f5;
+  line-height: 1.5;
+}
+
+@mixin title-large {
+  font-size: $h1;
+  line-height: 1.125;
+}

data/app/assets/stylesheets/captive-admin/mixins/_variables.scss

@@ -1 +1,3 @@
 @import 'captive-theme/variables';
+
+$menu-arrow-light-icon-url: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgY2xhc3M9InctOCBtci00IGljb24tY2hldmVyb24tZG93biI+PHBhdGggY2xhc3M9InNlY29uZGFyeSIgZmlsbD0iI2ZmZmZmZiIgZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMTUuMyAxMC4zYTEgMSAwIDAgMSAxLjQgMS40bC00IDRhMSAxIDAgMCAxLTEuNCAwbC00LTRhMSAxIDAgMCAxIDEuNC0xLjRsMy4zIDMuMjkgMy4zLTMuM3oiPjwvcGF0aD48L3N2Zz4=';

data/app/assets/stylesheets/captive-admin/structure/_main_structure.scss

@@ -0,0 +1,3 @@
+#active_admin_content {
+  padding: $spacer-3 $spacer-6;
+}

data/app/assets/stylesheets/captive-admin/structure/_title_bar.scss

@@ -1,4 +1,13 @@
 #title_bar {
+  border-bottom: none;
+  background: none;
+  box-shadow: none;
+  padding: $spacer-3 $spacer-6;
+
+  h2 {
+    @include title-large;
+  }
+
   .action_items {
     span.action_item {
       & > a,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: captive-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha
+  version: 0.2.2
 platform: ruby
 authors:
 - Captive
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0.alpha
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ files:
 - app/assets/stylesheets/captive-admin/_header.scss
 - app/assets/stylesheets/captive-admin/_mixins.scss
 - app/assets/stylesheets/captive-admin/_typography.scss
+- app/assets/stylesheets/captive-admin/components/_breadcrumbs.scss
 - app/assets/stylesheets/captive-admin/components/_links.scss
 - app/assets/stylesheets/captive-admin/components/_panels.scss
 - app/assets/stylesheets/captive-admin/components/_status_tags.scss
@@ -78,6 +79,7 @@ files:
 - app/assets/stylesheets/captive-admin/mixins/_typography.scss
 - app/assets/stylesheets/captive-admin/mixins/_variables.scss
 - app/assets/stylesheets/captive-admin/pages/_logged_out.scss
+- app/assets/stylesheets/captive-admin/structure/_main_structure.scss
 - app/assets/stylesheets/captive-admin/structure/_title_bar.scss
 - lib/captive/admin.rb
 - lib/captive/admin/engine.rb
@@ -87,7 +89,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://captive.fr/
-  source_code_uri: https://github.com/Captive-Studio/captive-sdk/tree/v0.1.0.alpha/captive-admin
+  source_code_uri: https://github.com/Captive-Studio/captive-sdk/tree/v0.2.2/captive-admin
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -99,9 +101,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.26
 signing_key: