atlas_assets 0.1.12 → 0.1.13

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/Gemfile.lock +10 -10
  2. data/docs/_posts/2013-05-17-buttons.md +23 -0
  3. data/lib/assets/stylesheets/atlas_assets/_button-groups.scss +68 -0
  4. data/lib/assets/stylesheets/atlas_assets/_buttons.scss +8 -5
  5. data/lib/assets/stylesheets/atlas_assets/_variables.scss +7 -0
  6. data/lib/assets/stylesheets/atlas_assets.scss +1 -0
  7. data/lib/atlas_assets/version.rb +1 -1
  8. metadata +3 -2
data/Gemfile.lock CHANGED
@@ -1,15 +1,15 @@
1
1
  GIT
2
2
  remote: git://github.com/ixti/jekyll-assets.git
3
- revision: 0b8f155c5aab2967bf13635490bc1ff0a356f47f
3
+ revision: 329380b5efe990ebce810333497f20622392bb77
4
4
  specs:
5
- jekyll-assets (0.5.3)
5
+ jekyll-assets (0.6.1)
6
6
  jekyll (~> 1.0)
7
- sprockets (~> 2.9)
7
+ sprockets (~> 2.10)
8
8
 
9
9
  PATH
10
10
  remote: .
11
11
  specs:
12
- atlas_assets (0.1.9)
12
+ atlas_assets (0.1.13)
13
13
  handlebars_assets (~> 0.12.1)
14
14
 
15
15
  GEM
@@ -19,7 +19,7 @@ GEM
19
19
  fast-stemmer (>= 1.0.0)
20
20
  coderay (1.0.9)
21
21
  colorator (0.1)
22
- commander (4.1.3)
22
+ commander (4.1.4)
23
23
  highline (~> 1.6.11)
24
24
  directory_watcher (1.4.1)
25
25
  execjs (1.4.0)
@@ -31,18 +31,18 @@ GEM
31
31
  tilt
32
32
  highline (1.6.19)
33
33
  hike (1.2.3)
34
- jekyll (1.0.3)
34
+ jekyll (1.0.4)
35
35
  classifier (~> 1.3)
36
36
  colorator (~> 0.1)
37
37
  commander (~> 4.1.3)
38
38
  directory_watcher (~> 1.4.1)
39
39
  kramdown (~> 1.0.2)
40
- liquid (~> 2.3)
40
+ liquid (~> 2.5.1)
41
41
  maruku (~> 0.5)
42
42
  pygments.rb (~> 0.5.0)
43
43
  safe_yaml (~> 0.7.0)
44
44
  kramdown (1.0.2)
45
- liquid (2.5.0)
45
+ liquid (2.5.1)
46
46
  maruku (0.6.1)
47
47
  syntax (>= 1.0.0)
48
48
  multi_json (1.7.7)
@@ -50,7 +50,7 @@ GEM
50
50
  puma (2.0.1)
51
51
  rack (>= 1.1, < 2.0)
52
52
  pygmentize (0.0.3)
53
- pygments.rb (0.5.0)
53
+ pygments.rb (0.5.2)
54
54
  posix-spawn (~> 0.3.6)
55
55
  yajl-ruby (~> 1.1.0)
56
56
  rack (1.5.2)
@@ -59,7 +59,7 @@ GEM
59
59
  rack-rewrite (1.3.3)
60
60
  rake (10.0.4)
61
61
  safe_yaml (0.7.1)
62
- sass (3.2.9)
62
+ sass (3.2.10)
63
63
  sprockets (2.10.0)
64
64
  hike (~> 1.2)
65
65
  multi_json (~> 1.0)
data/docs/_posts/2013-05-17-buttons.md CHANGED
@@ -35,6 +35,7 @@ Colors
35
35
  <p><a href="#" class="btn blue">Blue</a></p>
36
36
  <p><a href="#" class="btn red">Red</a></p>
37
37
  <p><a href="#" class="btn green">Green</a></p>
38
+ <p><a href="#" class="btn gray">Gray</a></p>
38
39
  <p><a href="#" class="btn disabled">Disabled</a></p>
39
40
 
40
41
  ~~~html
@@ -43,3 +44,25 @@ Colors
43
44
  <a href="#" class="btn green">Green</a>
44
45
  <a href="#" class="btn disabled">Disabled</a>
45
46
  ~~~
47
+
48
+
49
+ Button Groups
50
+ -------------
51
+
52
+ <p>
53
+ <div class="btn-group">
54
+ <button type="button" class="btn medium gray">PDF</button>
55
+ <button type="button" class="btn medium gray">MOBI</button>
56
+ <button type="button" class="btn medium gray">EPUB</button>
57
+ <button type="button" class="btn medium gray">HTML</button>
58
+ </div>
59
+ </p>
60
+
61
+ ~~~html
62
+ <div class="btn-group">
63
+ <button type="button" class="btn medium gray">PDF</button>
64
+ <button type="button" class="btn medium gray">MOBI</button>
65
+ <button type="button" class="btn medium gray">EPUB</button>
66
+ <button type="button" class="btn medium gray">HTML</button>
67
+ </div>
68
+ ~~~
data/lib/assets/stylesheets/atlas_assets/_button-groups.scss ADDED
@@ -0,0 +1,68 @@
1
+ /* Container
2
+ _________________________________________________________________ */
3
+
4
+ .btn-group {
5
+ position: relative;
6
+ display: inline-block;
7
+ font-size: 0;
8
+ vertical-align: middle;
9
+ white-space: nowrap;
10
+ }
11
+
12
+ .btn-group + .btn-group {
13
+ margin-left: 5px;
14
+ }
15
+
16
+ /* Buttons
17
+ _________________________________________________________________ */
18
+
19
+ .btn-group > .btn {
20
+ position: relative;
21
+ @include border-radius(0);
22
+ }
23
+
24
+ .btn-group > .btn + .btn {
25
+ margin-left: -1px;
26
+ }
27
+
28
+ .btn-group > .btn,
29
+ .btn-group > .dropdown-menu,
30
+ .btn-group > .popover {
31
+ font-size: $baseFontSize;
32
+ }
33
+
34
+ .btn-group > .btn:first-child {
35
+ margin-left: 0;
36
+ @include border-top-left-radius($borderRadius);
37
+ @include border-bottom-left-radius($borderRadius);
38
+ }
39
+
40
+ .btn-group > .btn:last-child,
41
+ .btn-group > .dropdown-toggle {
42
+ @include border-top-right-radius($borderRadius);
43
+ @include border-bottom-right-radius($borderRadius);
44
+ }
45
+
46
+ .btn-group > .btn.large:first-child {
47
+ margin-left: 0;
48
+ @include border-top-left-radius($borderRadiusLarge);
49
+ @include border-bottom-left-radius($borderRadiusLarge);
50
+ }
51
+
52
+ .btn-group > .btn.large:last-child,
53
+ .btn-group > .large.dropdown-toggle {
54
+ @include border-top-right-radius($borderRadiusLarge);
55
+ @include border-bottom-right-radius($borderRadiusLarge);
56
+ }
57
+
58
+ .btn-group > .btn:hover,
59
+ .btn-group > .btn:focus,
60
+ .btn-group > .btn:active,
61
+ .btn-group > .btn.active {
62
+ z-index: 2;
63
+ }
64
+
65
+ .btn-group .dropdown-toggle:active,
66
+ .btn-group.open .dropdown-toggle {
67
+ outline: 0;
68
+ }
data/lib/assets/stylesheets/atlas_assets/_buttons.scss CHANGED
@@ -5,9 +5,7 @@
5
5
  cursor: pointer;
6
6
  padding: 4px 12px;
7
7
  text-decoration: none;
8
- -webkit-border-radius: 3px;
9
- -moz-border-radius: 3px;
10
- border-radius: 3px;
8
+ @include border-radius($borderRadius);
11
9
  outline: none;
12
10
  @include smooth();
13
11
  }
@@ -32,14 +30,14 @@ _________________________________________________________________ */
32
30
  .btn.medium {
33
31
  font-size: 17px;
34
32
  padding: 7px 16px;
35
- @include border-radius(6px);
33
+ @include border-radius($borderRadiusMedium);
36
34
  }
37
35
 
38
36
  .btn.large {
39
37
  font-size: 22px;
40
38
  padding: 12px 25px;
41
39
  line-height: 26px;
42
- @include border-radius(8px);
40
+ @include border-radius($borderRadiusLarge);
43
41
  }
44
42
 
45
43
  /* Colors
@@ -62,6 +60,11 @@ _________________________________________________________________ */
62
60
  color: $mid_gray;
63
61
  }
64
62
 
63
+ .btn.gray {
64
+ background-color: $light_gray;
65
+ color: $darker_gray;
66
+ }
67
+
65
68
  /* Close button
66
69
  _________________________________________________________________ */
67
70
 
data/lib/assets/stylesheets/atlas_assets/_variables.scss CHANGED
@@ -47,6 +47,13 @@ $inputBorder: $light_gray;
47
47
  $placeholderColor: $medium_gray;
48
48
  $horizontalComponentOffset: 180px;
49
49
 
50
+ /* Border Radius
51
+ ------------------------------------------------------- */
52
+
53
+ $borderRadius: 3px;
54
+ $borderRadiusMedium: 6px;
55
+ $borderRadiusLarge: 8px;
56
+
50
57
  /* Z-Indexes
51
58
  ------------------------------------------------------- */
52
59
 
data/lib/assets/stylesheets/atlas_assets.scss CHANGED
@@ -8,6 +8,7 @@
8
8
  @import "atlas_assets/icons";
9
9
  @import "atlas_assets/boxes";
10
10
  @import "atlas_assets/buttons";
11
+ @import "atlas_assets/button-groups";
11
12
  @import "atlas_assets/lists";
12
13
  @import "atlas_assets/code";
13
14
  @import "atlas_assets/flash";
data/lib/atlas_assets/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Atlas
2
2
  module Assets
3
- VERSION = "0.1.12"
3
+ VERSION = "0.1.13"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: atlas_assets
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.12
4
+ version: 0.1.13
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-07-24 00:00:00.000000000 Z
12
+ date: 2013-08-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: handlebars_assets
@@ -77,6 +77,7 @@ files:
77
77
  - lib/assets/javascripts/underscore.js
78
78
  - lib/assets/stylesheets/atlas_assets.scss
79
79
  - lib/assets/stylesheets/atlas_assets/_boxes.scss
80
+ - lib/assets/stylesheets/atlas_assets/_button-groups.scss
80
81
  - lib/assets/stylesheets/atlas_assets/_buttons.scss
81
82
  - lib/assets/stylesheets/atlas_assets/_code.scss
82
83
  - lib/assets/stylesheets/atlas_assets/_flash.scss