bootswatch-rails 0.4.0 → 0.5.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjQ4NTMwOTlhOTYxNDM4Y2U3YzlhMGIxMjllZmMzNGMyODQ4MDQ4Nw==
+  data.tar.gz: !binary |-
+    ZDNiYjgzNzZkOTJjZDFhZjA2NWUyYzc0OWVhNWUzNTQ5NTVmOTYwNQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    Zjc1ZjNhN2FlMTgzMDI3Y2E2Y2VlNjEzNDcxMmRlNzhiYmFiZDQ0ZmI0MDQw
+    MGMyNGRlNjA4MDJmNTA4OWQ1Nzg2MzAwZGYxMjlhYTQ0NjBkNjhiNjYyZmYz
+    NDEzZmM4ZGE4Mzk3N2NmZDUwMGY2NjVmODE2Y2Q0NGFjZjY3YWQ=
+  data.tar.gz: !binary |-
+    MzEzMTBkZjAwNDdlODk2OWEzZDJjMzRhNTQ3ZGJmMDUzNGE1ZTMyNjExZTMw
+    NjEyZmI4OGY3YzMxZjQ3MWMzYTMyMDJmNzY2MThkZTY1YmU2M2UzM2IwMjJm
+    YTQ3YzY2YWFmYTgwZTVhY2ExODBkZGNiMzJhODE5ZmU4ZTFiNWQ=

data/CONVERSION.md

@@ -0,0 +1,10 @@
+## Notes on conversion
+
+TODO: Automate these
+
+1. Update bootswatch submodule
+2. Run rake convert
+3. Run ./rearranges and fix variable declaration orders
+4. Search *.scss for this regexp: \We\( and remove occurrences of e function
+5. Search *.scss for this regexp: @include.+!important and move !important into parentheses
+6. Search *.scss for this regexp: &- and prepend parent selector instead

data/HISTORY.md

@@ -1,3 +1,10 @@
+## 0.5.0 (2013-02-22)
+
+* Update all themes to current bootswatch versions (2.3.2)
+* Add Flatly theme
+* Add script for determining variables that need to be rearranged
+* Add list of conversions to do manually (CONVERSION.md)
+
 ## 0.4.0 (2013-02-22)
 
 * Update all themes to current bootswatch versions (2.3.0)
@@ -11,7 +18,6 @@
 
 * Add !default to all bootswatch variables, making them overridable
 
-
 ## 0.3.0 (2013-01-13)
 
 * Add a converter script for most of the repetitive less/sass conversion work

data/README.md

@@ -68,6 +68,7 @@ Included bootswatches
 * [Cerulean](http://bootswatch.com/cerulean/)
 * [Cosmo](http://bootswatch.com/cosmo/)
 * [Cyborg](http://bootswatch.com/cyborg/)
+* [Flatly](http://bootswatch.com/flatly/)
 * [Journal](http://bootswatch.com/journal/)
 * [Readable](http://bootswatch.com/readable/)
 * [Simplex](http://bootswatch.com/simplex/)

data/Rakefile

@@ -6,6 +6,7 @@ THEMES = %w(
   cerulean
   cosmo
   cyborg
+  flatly
   journal
   readable
   simplex

data/lib/bootswatch-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootswatch
   module Rails
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/rearranges

@@ -0,0 +1,131 @@
+#!/usr/bin/env ruby
+
+# Run this script to see if any variables need to be rearranged
+
+body = if ARGV[0]
+  File.read(ARGV[0])
+else
+  Dir['vendor/assets/stylesheets/bootswatch/*/_variables.scss'].each do |path|
+    puts "#{path.split('/')[-2]}:"
+    puts `./#{__FILE__} #{path}`
+    puts "\n"
+  end
+  exit(0)
+end
+
+
+class Variable
+  class << self
+    attr_accessor :sections
+  end
+
+  def self.from_token(token, section_index)
+    if token.strip =~ /\:$/
+      new token.strip.chop.strip, section_index: section_index,
+        assignment: true
+    else
+      new token.strip, section_index: section_index
+    end
+  end
+
+  def initialize(name, options = {})
+    @name = name
+    @assignment = true if options[:assignment]
+    @section_index = options[:section_index]
+  end
+
+  attr_reader :section_index
+
+  def assignment?
+    @assignment
+  end
+
+  def section
+    self.class.sections[@section_index]
+  end
+
+  def section_header
+    self.class.sections[@section_index - 1]
+  end
+
+  def section_name
+    section_header.split("\n").first.sub('// ', '')
+  end
+
+  def to_s
+    @name
+  end
+
+  def ==(other)
+    to_s == other.to_s
+  end
+end
+
+Variable.sections = body.split(/(\/\/\s+\w[^\/]+\/\/\s+-+)/m)
+
+tokens = []
+in_section = false
+
+Variable.sections.each.with_index do |section, index|
+  if in_section
+    tokens[index] = section.scan(/\$\w+\s*\:?/)
+    in_section = false
+  elsif section =~ /(\/\/\s+\w[^\/]+\/\/\s+-+)/m
+    tokens[index] = []
+    in_section = true
+  else
+    tokens[index] = []
+  end
+end
+
+unassigned = []
+assigned = []
+
+tokens.each.with_index do |group, index|
+  group.each do |token|
+    variable = Variable.from_token(token, index)
+
+    if !variable.assignment? && !assigned.include?(variable)
+      unassigned << variable
+    end
+
+    if variable.assignment?
+      assigned << variable
+    end
+  end
+end
+
+moves = []
+unassigned.each do |variable|
+  assignment = assigned.find{|v| v == variable}
+  moves << [
+    [ variable.section_name,
+      variable.section_header,
+      variable.section,
+      variable ],
+    [ assignment.section_name,
+      assignment.section_header,
+      assignment.section,
+      assignment ]
+  ]
+end
+
+moves.uniq!
+
+moves.each do |move|
+  src_sec_name = move.first.first
+  dst_sec_name = move.last.first
+
+  src_var = move.first.last
+  dst_var = move.last.last
+
+  if src_sec_name == dst_sec_name
+    puts "  Swap lines under #{src_sec_name} section due to #{src_var}"
+  else
+    puts "  Move #{src_sec_name} section under #{dst_sec_name} due to #{src_var}"
+  end
+end
+
+if moves.empty?
+  puts "  All good!"
+end

data/vendor/assets/stylesheets/bootswatch/amelia/_bootswatch.scss

@@ -1,4 +1,4 @@
-// Amelia 2.3.0
+// Amelia 2.3.2
 // Bootswatch
 // -----------------------------------------------------
 
@@ -36,7 +36,7 @@ blockquote {
 }
 
 .muted {
-	color: rgba(255, 255, 255, 0.5);
+	color: rgba(255, 255, 255, 0.6);
 }
 
 // SCAFFOLDING
@@ -47,7 +47,7 @@ body {
 }
 
 hr {
-	border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+	border-bottom: none;
 }
 
 .page-header {
@@ -206,59 +206,79 @@ div.subnav {
 	}
 }
 
+@media (max-width: 767px) {
+	
+	div.subnav .nav > li + li > a {
+		border-top: 1px solid rgba(255, 255, 255, 0.4);
+	}
+}
+
 // NAV
 // -----------------------------------------------------
 
-.nav-tabs li.open > .dropdown-toggle,
-.nav-pills li.open > .dropdown-toggle {
-	background-color: #8AD5DC;
-	color: $linkColor;
-	border-color: transparent;
-}
+.nav-tabs,
+.nav-pills {
 
-.nav-tabs, .nav-pills {
 	border-color: transparent;
 
-	li > a {
+
+	& > li > a {
 		border-color: transparent;
 		@include border-radius(0);
 		@include box-shadow(0);
 	}
 
-	li.active > a,
-	li.active > a:hover {
-		color: $textColor;
+	& > li > a:hover {
+		background-color: #8AD5DC;
+		border-color: transparent;
+		text-shadow: none;
 	}
 
-	li.active > a,
-	li > a:hover,
-	li.active > a:hover {
+	& > .active > a,
+	& > .active > a:hover {
 		background-color: #8AD5DC;
 		border-color: transparent;
+		color: $textColor;
 		text-shadow: none;
 	}
-}
 
-.nav-tabs, .nav-tabs > li > a {
-	border-bottom: 1px solid rgba(255, 255, 255, 0.5);
-}
+	& > .disabled > a,
+	& > .disabled > a:hover {
+		background: none;
+		color: $grayLighter;
+	}
+
+	& > .open > .dropdown-toggle,
+	& > .open > .dropdown-toggle {
+		background-color: #8AD5DC;
+		color: $linkColor;
+		border-color: transparent;
+	}
+
 
-.nav-tabs > li > a {
-	background-color: #3CB9C6;
 }
 
-.nav-tabs.nav-stacked {
+.nav-tabs {
 
-	li > a:first-child,
-	li > a:last-child {
-		@include border-radius(0);
+	border-bottom: 1px solid rgba(255, 255, 255, 0.5);
+
+	& > li > a  {
+		background-color: #3CB9C6;
 	}
 
-	li > a,
-	li > a:hover,
-	li.active > a,
-	li.active > a:hover {
-		border-color: transparent;
+	&.nav-stacked {
+
+		li > a:first-child,
+		li > a:last-child {
+			@include border-radius(0);
+		}
+
+		li > a,
+		li > a:hover,
+		li.active > a,
+		li.active > a:hover {
+			border-color: transparent;
+		}
 	}
 }
 
@@ -294,6 +314,7 @@ div.subnav {
 }
 
 .breadcrumb {
+
 	background-color: #3CB9C6;
 	background-image: none;
 
@@ -305,8 +326,9 @@ div.subnav {
 		color: $white;
 	}
 
-	.divider {
-		color: $linkColor;
+	& > li > a.divider,
+	& > li > span.divider {
+		color: $grayLighter;
 	}
 }
 
@@ -382,7 +404,7 @@ div.subnav {
   // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
   &:active,
   &.active {
-    background-color: darken($color, 15%) e("\9");
+    background-color: darken($color, 15%);
   }
 }
 
@@ -494,8 +516,8 @@ legend {
 }
 
 legend, label, .help-block, .input-file {
-	color: $textColor;
 	border: 0px solid transparent;
+	color: inherit;
 }
 
 input, textarea, .uneditable-input {
@@ -526,12 +548,28 @@ input, textarea, .search-query, .uneditable-input,
 	border-top: 0px solid transparent;
 }
 
+.control-group.warning {
+  @include formFieldState($yellow, lighten($yellow, 30%), $warningBackground);
+}
+
+.control-group.error {
+  @include formFieldState($orange, lighten($orange, 30%), $errorBackground);
+}
+
+.control-group.success {
+  @include formFieldState($green, lighten($green, 20%), $successBackground);
+}
+
+.control-group.info {
+  @include formFieldState($purple, lighten($purple, 20%), $infoBackground);
+}
+
 .control-group.warning {
 
 	.control-label,
 	.help-block,
 	.help-inline {
-		color: lighten($orange, 30%);
+		color: lighten($yellow, 30%);
 	}
 }
 
@@ -540,7 +578,7 @@ input, textarea, .search-query, .uneditable-input,
 	.control-label,
 	.help-block,
 	.help-inline {
-		color: lighten($linkColor, 10%);
+		color: lighten($orange, 30%);
 	}
 }
 
@@ -552,6 +590,14 @@ input, textarea, .search-query, .uneditable-input,
 		color: lighten($green, 20%);
 	}
 }
+.control-group.info {
+
+	.control-label,
+	.help-block,
+	.help-inline {
+		color: lighten($purple, 20%);
+	}
+}
 
 .input-prepend .add-on,
 .input-append .add-on {
@@ -701,7 +747,7 @@ input, textarea, .search-query, .uneditable-input,
 	}
 
 	.modal-body {
-
+		
 		color: $grayDark;
 
 		h1, h2, h3, h4, h5, h6,
@@ -728,7 +774,7 @@ input, textarea, .search-query, .uneditable-input,
 }
 
 .popover {
-
+	
 	padding: 0;
 	@include border-radius(0);
 	color: $grayDark;

data/vendor/assets/stylesheets/bootswatch/amelia/_variables.scss

@@ -1,4 +1,4 @@
-// Amelia 2.3.0
+// Amelia 2.3.2
 // Variables
 // --------------------------------------------------
 
@@ -33,7 +33,7 @@ $purple:                #4D3A7D !default;
 // Scaffolding
 // -------------------------
 $bodyBackground:        #003F4D !default;
-$textColor:             rgba(255, 255, 255, 0.9) !default;
+$textColor:             #E1F0F0 !default;
 
 
 // Links
@@ -82,7 +82,6 @@ $tableBackgroundAccent:             lighten(#147E88, 15%) !default; // for strip
 $tableBackgroundHover:              rgba(255, 255, 255, 0.4) !default; // for hover
 $tableBorder:                       lighten(#147E88, 12%) !default; // table and cell border
 
-
 // Forms
 // -------------------------
 $inputBackground:               $white !default;
@@ -138,7 +137,7 @@ $placeholderText:         $grayLight !default;
 
 // Hr border color
 // -------------------------
-$hrBorder:                transparent !default;
+$hrBorder:                rgba(255, 255, 255, 0.3) !default;
 
 
 // Horizontal forms & lists
@@ -170,26 +169,6 @@ $navbarLinkBackgroundActive:      lighten($navbarBackground, 10%) !default;
 
 $navbarBrandColor:                $navbarLinkColor !default;
 
-// Inverted navbar
-$navbarInverseBackground:                $yellow !default;
-$navbarInverseBackgroundHighlight:       $yellow !default;
-$navbarInverseBorder:                    rgba(0, 0, 0, 0.1) !default;
-
-$navbarInverseText:                      $white !default;
-$navbarInverseLinkColor:                 $white !default;
-$navbarInverseLinkColorHover:            $white !default;
-$navbarInverseLinkColorActive:           $white !default;
-$navbarInverseLinkBackgroundHover:       rgba(255, 255, 255, 0.2) !default;
-$navbarInverseLinkBackgroundActive:      rgba(255, 255, 255, 0.2) !default;
-
-$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%) !default;
-$navbarInverseSearchBackgroundFocus:     $white !default;
-$navbarInverseSearchBorder:              $navbarInverseBackground !default;
-$navbarInverseSearchPlaceholderColor:    $white !default;
-
-$navbarInverseBrandColor:                $navbarInverseLinkColor !default;
-
-
 // Buttons
 // -------------------------
 $btnBackground:                     $grayLighter !default;
@@ -214,6 +193,25 @@ $btnDangerBackgroundHighlight:      $yellow !default;
 $btnInverseBackground:              #27666D !default;
 $btnInverseBackgroundHighlight:     #27666D !default;
 
+// Inverted navbar
+$navbarInverseBackground:                $yellow !default;
+$navbarInverseBackgroundHighlight:       $yellow !default;
+$navbarInverseBorder:                    rgba(0, 0, 0, 0.1) !default;
+
+$navbarInverseText:                      $white !default;
+$navbarInverseLinkColor:                 $white !default;
+$navbarInverseLinkColorHover:            $white !default;
+$navbarInverseLinkColorActive:           $white !default;
+$navbarInverseLinkBackgroundHover:       rgba(255, 255, 255, 0.2) !default;
+$navbarInverseLinkBackgroundActive:      rgba(255, 255, 255, 0.2) !default;
+
+$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%) !default;
+$navbarInverseSearchBackgroundFocus:     $white !default;
+$navbarInverseSearchBorder:              $navbarInverseBackground !default;
+$navbarInverseSearchPlaceholderColor:    $white !default;
+
+$navbarInverseBrandColor:                $navbarInverseLinkColor !default;
+
 
 // Pagination
 // -------------------------