ama_css 0.0.6 → 0.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1451014d52934438962b5cf37b7d75a87e72fdb5
4
- data.tar.gz: a964816379adf7da8af8a23586120a9d5592643d
3
+ metadata.gz: bbb422e9053fbd61b3e5af8fdeb7117312552237
4
+ data.tar.gz: 5493a45c257b1b17cc1b883c1eec480cbd497509
5
5
  SHA512:
6
- metadata.gz: 6e9fe2ff5ce1687e60d3d2af3c331eb8e0ca1ad080045e93f1269d46446e0e4a949b7300a5a3ad0527ad128b3f9fbc32deefc4614f669711c532869f41f69d12
7
- data.tar.gz: 783e29dbc18112676132988c749915234ef746149f5bcbee61485390feb4428a9a7db54525a9542815b12c66f30f3a62928772b9f1cf7fe4464bab6c5745a8a0
6
+ metadata.gz: 1ea0711e70ebaeb10280952c02d20e37a92a79980dd1e3caa1cc1e2d8fba6a67fd5454d60e548a7fd604efde29d6bc345a4dc9f28a60dbe03cee4cd15fecdac9
7
+ data.tar.gz: a8a06b076a809754ed8bda34502bb75182f5f1aec314a22b7f5c67f88064047f2c419771fcf428fe4609fdfb43362f26947cd5e4ab80bda0d25c45f6e9f3c3c2
@@ -1 +1 @@
1
- 2.1.0
1
+ 2.1.2
@@ -2,6 +2,7 @@
2
2
 
3
3
  Bug fixes:
4
4
 
5
+ * Tablet layout was throwing a column 6 constraint on the main div. ([#8][], [@mvandenbeuken][])
5
6
  * Fixed the forms.scss. ([#7][], [@mvandenbeuken][])
6
7
 
7
8
  ## 2014-12-15
@@ -13,4 +14,5 @@ Features:
13
14
  <!--- The following link definition list is generated by PimpMyChangelog --->
14
15
  [#6]: https://github.com/amaabca/ama_css/issues/6
15
16
  [#7]: https://github.com/amaabca/ama_css/issues/7
17
+ [#8]: https://github.com/amaabca/ama_css/issues/8
16
18
  [@mvandenbeuken]: https://github.com/mvandenbeuken
@@ -83,6 +83,13 @@ body{
83
83
  float:none;
84
84
  clear:both;
85
85
  }
86
+ .grid-1,.grid-5,.grid-7,.grid-11,.grid-12,.grid-full,.collapse{
87
+ /*100% width in 6 col grid for mobile - grids 2,3,4,6,10,9,8 don't collapse unless .collapse added to tag*/
88
+ @include media($mobile) {
89
+ width:100%;
90
+ margin-right:0;
91
+ }
92
+ }
86
93
  %clearance{
87
94
  margin-bottom:$base-margin;
88
95
  }
@@ -3,9 +3,6 @@
3
3
  }
4
4
  .container-fluid{
5
5
  @include outer-container;
6
- @include media($mobile) {
7
- @include span-columns(6);
8
- }
9
6
  @include media($smalldesk){
10
7
  padding:0 $base-padding;
11
8
  }
@@ -4,6 +4,7 @@ label{
4
4
 
5
5
  // our version of simpleform doesn't support per item (checkbox + label) css
6
6
  label.collection_radio,
7
+ label.collection_radio_buttons,
7
8
  label.inline,
8
9
  label[for=primary_membership_automatic_credit_card_renewal],
9
10
  label[for=primary_membership_electronic_billing],
@@ -36,6 +37,13 @@ section.upgrade-renewal-options label {
36
37
 
37
38
  .actions{
38
39
  margin:$base-margin/2 0;
40
+ a, input, button {
41
+ display: inline-block;
42
+ margin-right:$base-margin;
43
+ @include media($mobile) {
44
+ margin-bottom:$base-margin/2;
45
+ }
46
+ }
39
47
  }
40
48
  .action-link{
41
49
  margin-top:$base-margin/2;
@@ -87,7 +95,7 @@ section.upgrade-renewal-options label {
87
95
  display:none;
88
96
  }
89
97
  /* buttons */
90
- button, .button{
98
+ button, .button, .button-pill {
91
99
  @extend %boxRadius-small;
92
100
  border: 0;
93
101
  padding: $base-padding/2;
@@ -99,13 +107,22 @@ button, .button{
99
107
  width:100%;
100
108
  }
101
109
  }
102
- .button:active, .button:focus{
110
+ button:active, .button:active, .button-pill:active,
111
+ button:focus, .button:focus, .button-pill:focus {
103
112
  background:#333;
104
113
  color:$color-white;
105
114
  @include media($mobile) {
106
115
  width:100%;
107
116
  }
108
117
  }
118
+ a.button, a.button-pill{
119
+ color:$color-white;
120
+ text-decoration: none;
121
+ }
122
+
123
+ .button-pill{
124
+ padding:$base-padding/5 $base-padding;
125
+ }
109
126
  .button-danger{
110
127
  @extend %bg-red;
111
128
  @include button-coloring($color-red);
@@ -127,17 +144,23 @@ button, .button{
127
144
  padding:$base-padding/5;
128
145
  font-size:.9em;
129
146
  }
130
- .button a, .button li{
147
+ button a:link,
148
+ button a:active,
149
+ button a:visited,
150
+ .button a:link,
151
+ .button a:active,
152
+ .button a:visited,
153
+ .button li {
131
154
  color: $color-white;
132
155
  }
133
156
 
134
157
  /* inputs/form elements */
135
- input.input-stretch{ width:100%;}
136
- input.input-large{ width:90%}
137
- input.input-medium{ width:75%;}
138
- input.input-short{ width:40%;}
139
- input.input-small{ width:30px;}
140
- input.input-large, input.input-medium{
158
+ input.input-stretch{ width:100%; }
159
+ input.input-large{ width:90%; }
160
+ input.input-medium{ width:75%; }
161
+ input.input-short{ width:40%; }
162
+ input.input-small{ width:30px; }
163
+ input.input-large, input.input-medium {
141
164
  @include media($mobile) {
142
165
  @include span-columns(6);
143
166
  width:100%;
@@ -163,3 +186,13 @@ fieldset, .fieldset{
163
186
  @extend %boxRadius-big;
164
187
  padding: $base-padding/2 $base-padding;
165
188
  }
189
+ .form-row{
190
+ margin:$base-margin 0;
191
+ }
192
+ .form-dialog{
193
+ @extend .widget;
194
+ @extend .centered;
195
+ @extend .collapse;
196
+ @extend .grid-6;
197
+ }
198
+
@@ -547,4 +547,58 @@ ul.member-info {
547
547
  }
548
548
  .placeholder-img img{
549
549
  max-width:80%;
550
+ }
551
+ .box{
552
+ @include boxRadius(big);
553
+ padding: $base-padding / 2;
554
+ }
555
+ .widget{
556
+ @extend .box;
557
+ &.outline{
558
+ border: $color-border $base-border-thickness solid;
559
+ padding:0;
560
+ overflow:hidden;
561
+ h4{
562
+ margin-top:0;
563
+ -webkit-border-radius: 0 0 $box-radius-big 0;
564
+ -moz-border-radius: 0 0 $box-radius-big 0;
565
+ border-radius: 0 0 $box-radius-big 0;
566
+ padding:$base-padding/2;
567
+ color:$color-white;
568
+ background-color:$color-primary;
569
+ width:20em;
570
+ margin-bottom:0;
571
+ }
572
+ }
573
+ &.filled{
574
+ background-color: lighten($color-primary,70);
575
+ }
576
+ &.centered{
577
+ margin:auto;
578
+ float:none;
579
+ border:$border;
580
+ padding:$base-padding;
581
+ h1{
582
+ font-size:1.4em;
583
+ font-size:1.4rem;
584
+ }
585
+ h2{
586
+ font-size:1.2em;
587
+ font-size:1.2rem;
588
+ }
589
+ }
590
+ }
591
+ .panel {
592
+ @extend .widget;
593
+ @extend .grid-full;
594
+ @extend .collapse;
595
+ position:relative;
596
+ border: $border;
597
+ padding:$base-padding;
598
+ margin: $base-margin auto;
599
+ .item {
600
+ &:nth-child(2){
601
+ background: $color-superlight;
602
+ }
603
+ }
550
604
  }
@@ -25,27 +25,54 @@
25
25
  }
26
26
  .widget{
27
27
  @extend .box;
28
- }
29
- .widget.outline{
30
- border: $color-border $base-border-thickness solid;
31
- padding:0;
32
- overflow:hidden;
33
- h4{
34
- margin-top:0;
35
- -webkit-border-radius: 0 0 $box-radius-big 0;
36
- -moz-border-radius: 0 0 $box-radius-big 0;
37
- border-radius: 0 0 $box-radius-big 0;
38
- padding:$base-padding/2;
39
- color:$color-white;
40
- background-color:$color-primary;
41
- width:20em;
42
- margin-bottom:0;
28
+ &.outline{
29
+ border: $color-border $base-border-thickness solid;
30
+ padding:0;
31
+ overflow:hidden;
32
+ h4{
33
+ margin-top:0;
34
+ -webkit-border-radius: 0 0 $box-radius-big 0;
35
+ -moz-border-radius: 0 0 $box-radius-big 0;
36
+ border-radius: 0 0 $box-radius-big 0;
37
+ padding:$base-padding/2;
38
+ color:$color-white;
39
+ background-color:$color-primary;
40
+ width:20em;
41
+ margin-bottom:0;
42
+ }
43
+ }
44
+ &.filled{
45
+ background-color: lighten($color-primary,70);
46
+ }
47
+ &.centered{
48
+ margin:auto;
49
+ float:none;
50
+ border:$border;
51
+ padding:$base-padding;
52
+ h1{
53
+ font-size:1.4em;
54
+ font-size:1.4rem;
55
+ }
56
+ h2{
57
+ font-size:1.2em;
58
+ font-size:1.2rem;
59
+ }
43
60
  }
44
61
  }
45
- .widget.filled{
46
- background-color: lighten($color-primary,70);
62
+ .panel {
63
+ @extend .widget;
64
+ @extend .grid-full;
65
+ @extend .collapse;
66
+ position:relative;
67
+ border: $border;
68
+ padding:$base-padding;
69
+ margin: $base-margin auto;
70
+ .item {
71
+ &:nth-child(2){
72
+ background: $color-superlight;
73
+ }
74
+ }
47
75
  }
48
-
49
76
  .logo{
50
77
  margin:0 0 0 $base-margin;
51
78
  img{
@@ -63,10 +90,14 @@
63
90
  width:auto;
64
91
  }
65
92
  }
66
- .applogo{
93
+ .applogo {
67
94
  @include clearfix();
68
- a{ text-decoration:none;}
69
- h2{ font-size:1.2em; margin:$base-margin/2 0;}
95
+ a {
96
+ text-decoration:none;
97
+ }
98
+ h2 {
99
+ font-size:1.2em; margin:$base-margin/2 0;
100
+ }
70
101
  }
71
102
  .waiting{
72
103
  margin:$base-margin 0;
@@ -120,13 +151,13 @@
120
151
  /*errors and messages*/
121
152
  .error { display: block; }
122
153
  .error.inline { display: inline-block; }
123
- .error, .error_notification{ color: lighten($color-red, 14%); }
154
+ .error, .error_notification, .error_notification a { color: lighten($color-red, 14%); }
124
155
  .login.front .error { color: lighten($color-red, 35%); }
125
156
  .button-bar .error { background: none; color: $color-red; }
126
157
  .error.button-bar-last-span.selected { box-shadow: none; }
127
158
 
128
159
  .notice{ display:block; }
129
- .notice, .notice_notification { color: $color-green; }
160
+ .notice, .notice_notification, .notice_notification a { color: $color-green; }
130
161
 
131
162
  .error_notification{ @include notification($color-red); }
132
163
  .notice_notification{ @include notification($color-green); }
@@ -192,6 +223,7 @@ p.notice_notification:before { @include notification-icon('\263B'); }
192
223
 
193
224
  /* UI effects */
194
225
  #nowloading { display: inline; position: relative; left: 40px; }
226
+ .spinner { display: inline; top: 15px; left: 15px; }
195
227
 
196
228
  /* CAA Dollars History */
197
229
  .caa-dollars-table { width: 100%; }
@@ -1,3 +1,3 @@
1
1
  module AmaCss
2
- VERSION = "0.0.6"
2
+ VERSION = "0.1.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ama_css
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.6
4
+ version: 0.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Darko Dosenovic
@@ -14,7 +14,7 @@ authors:
14
14
  autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
- date: 2014-12-16 00:00:00.000000000 Z
17
+ date: 2017-01-09 00:00:00.000000000 Z
18
18
  dependencies:
19
19
  - !ruby/object:Gem::Dependency
20
20
  name: bundler
@@ -72,8 +72,8 @@ dependencies:
72
72
  - - '='
73
73
  - !ruby/object:Gem::Version
74
74
  version: 1.2.0
75
- description: "[\"This gem has been created to standardized use of css files for basic
76
- AMA applications.\"]"
75
+ description: '["This gem has been created to standardized use of css files for basic
76
+ AMA applications."]'
77
77
  email:
78
78
  - darko.dosenovic@ama.ab.ca
79
79
  - michael.beuken@gmail.com
@@ -103,6 +103,7 @@ files:
103
103
  - app/assets/images/foundation/btn-search.gif
104
104
  - app/assets/images/foundation/calendar.png
105
105
  - app/assets/images/foundation/exclamation.png
106
+ - app/assets/images/foundation/lightbulb-cancelled.png
106
107
  - app/assets/images/foundation/lightbulb.png
107
108
  - app/assets/images/foundation/lightbulb_off.png
108
109
  - app/assets/images/foundation/lock.png
@@ -161,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
161
162
  version: '0'
162
163
  requirements: []
163
164
  rubyforge_project:
164
- rubygems_version: 2.2.0
165
+ rubygems_version: 2.2.2
165
166
  signing_key:
166
167
  specification_version: 4
167
- summary: "[\"CSS used by AMA apps\"]"
168
+ summary: '["CSS used by AMA apps"]'
168
169
  test_files: []