ama_css 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1451014d52934438962b5cf37b7d75a87e72fdb5
-  data.tar.gz: a964816379adf7da8af8a23586120a9d5592643d
+  metadata.gz: bbb422e9053fbd61b3e5af8fdeb7117312552237
+  data.tar.gz: 5493a45c257b1b17cc1b883c1eec480cbd497509
 SHA512:
-  metadata.gz: 6e9fe2ff5ce1687e60d3d2af3c331eb8e0ca1ad080045e93f1269d46446e0e4a949b7300a5a3ad0527ad128b3f9fbc32deefc4614f669711c532869f41f69d12
-  data.tar.gz: 783e29dbc18112676132988c749915234ef746149f5bcbee61485390feb4428a9a7db54525a9542815b12c66f30f3a62928772b9f1cf7fe4464bab6c5745a8a0
+  metadata.gz: 1ea0711e70ebaeb10280952c02d20e37a92a79980dd1e3caa1cc1e2d8fba6a67fd5454d60e548a7fd604efde29d6bc345a4dc9f28a60dbe03cee4cd15fecdac9
+  data.tar.gz: a8a06b076a809754ed8bda34502bb75182f5f1aec314a22b7f5c67f88064047f2c419771fcf428fe4609fdfb43362f26947cd5e4ab80bda0d25c45f6e9f3c3c2

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.2

data/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 Bug fixes:
 
+* Tablet layout was throwing a column 6 constraint on the main div. ([#8][], [@mvandenbeuken][])
 * Fixed the forms.scss. ([#7][], [@mvandenbeuken][])
 
 ## 2014-12-15
@@ -13,4 +14,5 @@ Features:
 <!--- The following link definition list is generated by PimpMyChangelog --->
 [#6]: https://github.com/amaabca/ama_css/issues/6
 [#7]: https://github.com/amaabca/ama_css/issues/7
+[#8]: https://github.com/amaabca/ama_css/issues/8
 [@mvandenbeuken]: https://github.com/mvandenbeuken

data/app/assets/stylesheets/foundation/layout/layout.mobile.scss

@@ -83,6 +83,13 @@ body{
   float:none;
   clear:both;
 }
+.grid-1,.grid-5,.grid-7,.grid-11,.grid-12,.grid-full,.collapse{
+  /*100% width in 6 col grid for mobile - grids 2,3,4,6,10,9,8 don't collapse unless .collapse added to tag*/
+  @include media($mobile) {
+    width:100%;
+    margin-right:0;
+  }
+}
 %clearance{
   margin-bottom:$base-margin;
 }

data/app/assets/stylesheets/foundation/layout/layout.scss

@@ -3,9 +3,6 @@
 }
 .container-fluid{
   @include outer-container;
-  @include media($mobile) {
-    @include span-columns(6);
-  }
   @include media($smalldesk){
     padding:0 $base-padding;
   }

data/app/assets/stylesheets/foundation/modules/forms.scss

@@ -4,6 +4,7 @@ label{
 
 // our version of simpleform doesn't support per item (checkbox + label) css
 label.collection_radio,
+label.collection_radio_buttons,
 label.inline,
 label[for=primary_membership_automatic_credit_card_renewal],
 label[for=primary_membership_electronic_billing],
@@ -36,6 +37,13 @@ section.upgrade-renewal-options label {
 
 .actions{
   margin:$base-margin/2 0;
+  a, input, button {
+    display: inline-block;
+    margin-right:$base-margin;
+    @include media($mobile) {
+      margin-bottom:$base-margin/2;
+    }
+  }
 }
 .action-link{
   margin-top:$base-margin/2;
@@ -87,7 +95,7 @@ section.upgrade-renewal-options label {
   display:none;
 }
 /* buttons */
-button, .button{
+button, .button, .button-pill {
   @extend %boxRadius-small;
   border: 0;
   padding: $base-padding/2;
@@ -99,13 +107,22 @@ button, .button{
     width:100%;
   }
 }
-.button:active, .button:focus{
+button:active, .button:active, .button-pill:active,
+button:focus, .button:focus, .button-pill:focus {
   background:#333;
   color:$color-white;
   @include media($mobile) {
     width:100%;
   }
 }
+a.button, a.button-pill{
+  color:$color-white;
+  text-decoration: none;
+}
+
+.button-pill{
+  padding:$base-padding/5 $base-padding;
+}
 .button-danger{
   @extend %bg-red;
   @include button-coloring($color-red);
@@ -127,17 +144,23 @@ button, .button{
   padding:$base-padding/5;
   font-size:.9em;
 }
-.button a, .button li{
+button a:link,
+button a:active,
+button a:visited,
+.button a:link,
+.button a:active,
+.button a:visited,
+.button li {
   color: $color-white;
 }
 
 /* inputs/form elements */
-input.input-stretch{ width:100%;}
-input.input-large{ width:90%}
-input.input-medium{ width:75%;}
-input.input-short{ width:40%;}
-input.input-small{ width:30px;}
-input.input-large, input.input-medium{
+input.input-stretch{ width:100%; }
+input.input-large{ width:90%; }
+input.input-medium{ width:75%; }
+input.input-short{ width:40%; }
+input.input-small{ width:30px; }
+input.input-large, input.input-medium {
   @include media($mobile) {
     @include span-columns(6);
     width:100%;
@@ -163,3 +186,13 @@ fieldset, .fieldset{
   @extend %boxRadius-big;
   padding: $base-padding/2 $base-padding;
 }
+.form-row{
+  margin:$base-margin 0;
+}
+.form-dialog{
+  @extend .widget;
+  @extend .centered;
+  @extend .collapse;
+  @extend .grid-6;
+}
+

data/app/assets/stylesheets/foundation/modules/module.mobile.scss

@@ -547,4 +547,58 @@ ul.member-info {
 }
 .placeholder-img img{
   max-width:80%;
+}
+.box{
+  @include boxRadius(big);
+  padding: $base-padding / 2;
+}
+.widget{
+  @extend .box;
+  &.outline{
+    border: $color-border $base-border-thickness solid;
+    padding:0;
+    overflow:hidden;
+    h4{
+      margin-top:0;
+      -webkit-border-radius: 0 0 $box-radius-big 0;
+      -moz-border-radius: 0 0 $box-radius-big 0;
+      border-radius: 0 0 $box-radius-big 0;
+      padding:$base-padding/2;
+      color:$color-white;
+      background-color:$color-primary;
+      width:20em;
+      margin-bottom:0;
+    }
+  }
+  &.filled{
+    background-color: lighten($color-primary,70);
+  }
+  &.centered{
+    margin:auto;
+    float:none;
+    border:$border;
+    padding:$base-padding;
+    h1{
+      font-size:1.4em;
+      font-size:1.4rem;
+    }
+    h2{
+      font-size:1.2em;
+      font-size:1.2rem;
+    }
+  }
+}
+.panel {
+  @extend .widget;
+  @extend .grid-full;
+  @extend .collapse;
+  position:relative;
+  border: $border;
+  padding:$base-padding;
+  margin: $base-margin auto;
+  .item {
+    &:nth-child(2){
+      background: $color-superlight;
+    }
+  }
 }

data/app/assets/stylesheets/foundation/modules/module.scss

@@ -25,27 +25,54 @@
 }
 .widget{
   @extend .box;
-}
-.widget.outline{
-  border: $color-border $base-border-thickness solid;
-  padding:0;
-  overflow:hidden;
-  h4{
-    margin-top:0;
-    -webkit-border-radius: 0 0 $box-radius-big 0;
-    -moz-border-radius: 0 0 $box-radius-big 0;
-    border-radius: 0 0 $box-radius-big 0;
-    padding:$base-padding/2;
-    color:$color-white;
-    background-color:$color-primary;
-    width:20em;
-    margin-bottom:0;
+  &.outline{
+    border: $color-border $base-border-thickness solid;
+    padding:0;
+    overflow:hidden;
+    h4{
+      margin-top:0;
+      -webkit-border-radius: 0 0 $box-radius-big 0;
+      -moz-border-radius: 0 0 $box-radius-big 0;
+      border-radius: 0 0 $box-radius-big 0;
+      padding:$base-padding/2;
+      color:$color-white;
+      background-color:$color-primary;
+      width:20em;
+      margin-bottom:0;
+    }
+  }
+  &.filled{
+    background-color: lighten($color-primary,70);
+  }
+  &.centered{
+    margin:auto;
+    float:none;
+    border:$border;
+    padding:$base-padding;
+    h1{
+      font-size:1.4em;
+      font-size:1.4rem;
+    }
+    h2{
+      font-size:1.2em;
+      font-size:1.2rem;
+    }
   }
 }
-.widget.filled{
-  background-color: lighten($color-primary,70);
+.panel {
+  @extend .widget;
+  @extend .grid-full;
+  @extend .collapse;
+  position:relative;
+  border: $border;
+  padding:$base-padding;
+  margin: $base-margin auto;
+  .item {
+    &:nth-child(2){
+      background: $color-superlight;
+    }
+  }
 }
-
 .logo{
   margin:0 0 0 $base-margin;
   img{
@@ -63,10 +90,14 @@
     width:auto;
   }
 }
-.applogo{
+.applogo {
   @include clearfix();
-  a{ text-decoration:none;}
-  h2{ font-size:1.2em; margin:$base-margin/2 0;}
+  a {
+    text-decoration:none;
+  }
+  h2 {
+    font-size:1.2em; margin:$base-margin/2 0;
+  }
 }
 .waiting{
   margin:$base-margin 0;
@@ -120,13 +151,13 @@
 /*errors and messages*/
 .error { display: block; }
 .error.inline { display: inline-block; }
-.error, .error_notification{ color: lighten($color-red, 14%); }
+.error, .error_notification, .error_notification a { color: lighten($color-red, 14%); }
 .login.front .error { color: lighten($color-red, 35%); }
 .button-bar .error { background: none; color: $color-red; }
 .error.button-bar-last-span.selected { box-shadow: none; }
 
 .notice{ display:block; }
-.notice, .notice_notification { color: $color-green; }
+.notice, .notice_notification, .notice_notification a { color: $color-green; }
 
 .error_notification{ @include notification($color-red); }
 .notice_notification{ @include notification($color-green); }
@@ -192,6 +223,7 @@ p.notice_notification:before { @include notification-icon('\263B'); }
 
 /* UI effects */
 #nowloading { display: inline; position: relative; left: 40px; }
+.spinner { display: inline; top: 15px; left: 15px; }
 
 /* CAA Dollars History */
 .caa-dollars-table { width: 100%; }

data/lib/ama_css/version.rb

@@ -1,3 +1,3 @@
 module AmaCss
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ama_css
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Darko Dosenovic
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,8 +72,8 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
-description: "[\"This gem has been created to standardized use of css files for basic
-  AMA applications.\"]"
+description: '["This gem has been created to standardized use of css files for basic
+  AMA applications."]'
 email:
 - darko.dosenovic@ama.ab.ca
 - michael.beuken@gmail.com
@@ -103,6 +103,7 @@ files:
 - app/assets/images/foundation/btn-search.gif
 - app/assets/images/foundation/calendar.png
 - app/assets/images/foundation/exclamation.png
+- app/assets/images/foundation/lightbulb-cancelled.png
 - app/assets/images/foundation/lightbulb.png
 - app/assets/images/foundation/lightbulb_off.png
 - app/assets/images/foundation/lock.png
@@ -161,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: "[\"CSS used by AMA apps\"]"
+summary: '["CSS used by AMA apps"]'
 test_files: []