Merge pull request Katello#237 from knowncitizen/spritesfix

More SCSS refactoring and a fix for converge-ui spec.

src/app/controllers/subscriptions_controller.rb

@@ -18,6 +18,9 @@ def rules
     }
   end
 
+  def section_id
+    'orgs'
+  end
 
   def index
     # Raw candlepin pools

src/app/stylesheets/_custom_sprites.scss

@@ -0,0 +1,42 @@
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+
+$body_background_img:         image-url("embed/outer-background.png") repeat-x 0 -7px #FFF;
+$center_background_img:       image-url("embed/center-background.png") no-repeat center top transparent;
+$third_level_background_img:  image-url("embed/3rd-level-bg.png") no-repeat bottom center transparent;
+$subnav_shadow_img:           image-url("embed/subnav-shadow.png") repeat-x 0 bottom transparent;
+$footer_shade_img:            image-url("embed/footer-shade.png") repeat-x 0 0 transparent;
+$order_desc_img:              image-url("embed/icons/order-desc.png") no-repeat center right;
+$order_asc_img:               image-url("embed/icons/order-asc.png") no-repeat center right;
+$ui_totop_img:                image-url("embed/icons/ui.totop.png") no-repeat left top;
+$ui_totop_hover_img:          image-url("embed/icons/ui.totop.png") no-repeat left -32px;
+$ninesixty_img:               image-url("embed/960.png") repeat-y top center;
+$input_background_img:        image-url("embed/input-bg.png") repeat-x 0 0 #f0f0f0;
+$arrow_min_img:               image-url("embed/icons/expander-collapsed.png") no-repeat top center;
+$arrow_max_img:               image-url("embed/icons/expander-expanded.png") no-repeat top center;
+$info_icon:                   image-url("embed/icons/info.png") no-repeat scroll 98% 6px transparent;
+$info_hover_icon:             image-url("embed/icons/info.png") no-repeat scroll 98% 6px transparent;
+$edit_icon:                   image-url("embed/icons/edit.png") no-repeat scroll 98% 6px transparent;
+$edit_hover_icon:             image-url("embed/icons/edit-hover.png") no-repeat scroll 98% 6px #F2F2F2;
+$home_icon_black:             image-url("embed/icons/breadcrumb-icons.png") -16px -16px no-repeat;
+$home_icon_green:             image-url("embed/icons/breadcrumb-icons.png") -16px 0px no-repeat;
+$locked_icon:                 image-url("embed/icons/locked.png") 0 0 no-repeat;
+$dotdotdot_icon:              image-url("embed/icons/dotdotdot.png") no-repeat right bottom transparent;
+$close_icon:                  image-url("embed/icons/close.png") no-repeat scroll right center transparent;
+$search_icon_black:           image-url("embed/icons/breadcrumb-icons.png") 0px -16px no-repeat;
+$icon_search_grey:            image-url("embed/icons/icon_search.png") no-repeat 0 0;
+$grabber_icon:                image-url("embed/icons/grabber.png") 1px 50% no-repeat;
+$status_icon_green:           image-url("embed/icons/status.png") no-repeat 0 0;
+$status_icon_yellow:          image-url("embed/icons/status.png") no-repeat 0 -10px;
+$status_icon_red:             image-url("embed/icons/status.png") no-repeat 0 -25px;
+$status_exclamation_icon:     image-url("embed/icons/statusicons.png") no-repeat 0 0;
+$status_confirm_icon:         image-url("embed/icons/statusicons.png") no-repeat -16px 0;
+$status_alert_icon:           image-url("embed/icons/statusicons.png") no-repeat -32px 0;
+$status_icons_green:          image-url("embed/icons/status_icons_sprite.png") no-repeat 0 0;
+$status_icons_green_small:    image-url("embed/icons/status_icons_sprite.png") no-repeat 1px -26px;
+$status_icons_yellow:         image-url("embed/icons/status_icons_sprite.png") no-repeat -53px 0;
+$status_icons_yellow_small:   image-url("embed/icons/status_icons_sprite.png") no-repeat -30px -25px;
+$status_icons_red:            image-url("embed/icons/status_icons_sprite.png") no-repeat -25px 0;
+$status_icons_red_small:      image-url("embed/icons/status_icons_sprite.png") no-repeat -15px -25px;
+$icon_menu_arrow:             image-url("embed/icons/icon_menu_arrow.gif") no-repeat 0 0;

src/app/stylesheets/_grid.scss

@@ -3,6 +3,10 @@
  * *
  * Licensed under GPL and MIT. */
 
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+
 @import "compass/reset";
 @import "960/grid";
 

src/app/stylesheets/_katello_base.scss

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+
+@import "custom_sprites";

src/app/stylesheets/_look.scss

@@ -1,8 +1,8 @@
 @charset "UTF-8";
 @import "compass";
-@import "converge-ui/mixins";
-@import "converge-ui/colors";
-@import "converge-ui/sprites";
+@import "converge-ui/vars";
+
+
 
 #head {
   font-size: 12px;

src/app/stylesheets/sections/menu.scss → src/app/stylesheets/_menu.scss

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 @import "compass";
-@import "converge-ui/base";
-
+@import "converge-ui/vars";
+@import "converge-ui/mixins";
 
 nav {
   &.subnav { /* subnavigation */

src/app/stylesheets/fancyqueries.scss

@@ -1,5 +1,9 @@
 @charset "UTF-8";
-@import "converge-ui/base";
+@import "compass";
+@import "converge-ui/vars";
+@import "converge-ui/colors";
+@import "katello_base";
+
 
 /* GENERIC TEXT ENTRIES */
 input, textarea {

src/app/stylesheets/ie.scss

@@ -1,3 +1,8 @@
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+
+
 /* Welcome to Compass. Use this file to write IE specific override styles.
  * Import this file using the following HTML or equivalent:
  * <!--[if IE]>

src/app/stylesheets/katello.scss

@@ -1,13 +1,17 @@
 @charset "UTF-8";
 @import "compass";
-@import "grid";
-@import "look";
 
-@import "converge-ui/shell";
 @import "converge-ui/media";
+@import "converge-ui/base";
+@import "converge-ui/shell";
+@import "katello_base";
+
+@import "grid";
+@import "look";
+@import "menu";
 
 @import "widgets/multiselect";
-@import "widgets/_chosen";
+@import "widgets/chosen";
 @import "widgets/slidingtree";
 @import "widgets/scrollpane";
 @import "widgets/env_select";
@@ -50,8 +54,6 @@ hr { color: $border_color; }
 .ra { text-align: right; } /* text align right */
 .role-alt { color: #888;}
 .ca { text-align: center; } /* text align center */
-.fr { float: right; } /* float  right */
-.fl { float: left; } /* float left */
 .fc { display: inline-block; margin: 0 auto; } /* "float", center */
 .multiline{word-wrap: break-word;}
 

src/app/stylesheets/sections/contents.scss

@@ -1,5 +1,11 @@
-@import "converge-ui/base";
-
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+@import "converge-ui/colors";
+@import "converge-ui/text";
+@import "converge-ui/sprites";
+@import "converge-ui/mixins";
+@import "katello_base";
 
 #contents {
   .locked_breadcrumb {

src/app/stylesheets/sections/dashboard.scss

@@ -1,5 +1,7 @@
 @charset "UTF-8";
+@import "compass";
 @import "converge-ui/base";
+@import "katello_base";
 
 /* box for "errors" on the custom 500 error page */
 .dash {
@@ -54,6 +56,7 @@
       h4 {
         display: inline;
         margin-left: 10px;
+        margin-top: 11px;
       }
       h5 {
         display: inline;

src/app/stylesheets/sections/generic.scss

@@ -1,4 +1,8 @@
-@import "converge-ui/base";
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+@import "converge-ui/colors";
+@import "katello_base";
 
 #generic {
   #content {

src/app/stylesheets/sections/loginpage.scss

@@ -1,6 +1,12 @@
+@charset "UTF-8";
+@import "compass";
+
 $login_base-color: #006F8F;
 
 $login_background_top-color: darken(rgba(0, 157, 204, 1), 4%) !default;
 $login_background_bottom-color: darken(rgba(0, 111, 143, 1), 4%) !default;
 
+@import "converge-ui/colors";
+@import "converge-ui/base";
 @import "converge-ui/login";
+@import "katello_base";

src/app/stylesheets/sections/notifications.scss

@@ -1,9 +1,13 @@
 @charset "UTF-8";
 @import "compass";
+@import "converge-ui/base";
+
+
 #notifications {
     #search_form {
         margin-right: 13px;
         margin-top: 25px;
+        position: relative;
     }
     .deletable {
         display: block;

src/app/stylesheets/sections/operations.scss

@@ -1,3 +1,5 @@
+@charset "UTF-8";
+@import "compass";
 @import "converge-ui/base";
 
 #operations {

src/app/stylesheets/sections/orgs.scss

@@ -1,4 +1,7 @@
 @charset "UTF-8";
+@import "compass";
+@import "converge-ui/base";
+
 
 #orgs {
   #events {

src/app/stylesheets/sections/systems.scss

@@ -1,5 +1,11 @@
-@import "converge-ui/base";
-
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+@import "katello_base";
+@import "converge-ui/colors";
+@import "converge-ui/sprites";
+@import "converge-ui/text";
+@import "converge-ui/mixins";
 
 #systems {
   table {

src/app/stylesheets/sections/tabs.scss

@@ -1,4 +1,10 @@
-@import "converge-ui/base";
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+@import "converge-ui/text";
+@import "converge-ui/colors";
+@import "converge-ui/mixins";
+@import "converge-ui/sprites";
 
 /* override some of the jQuery UI stuff */
 .ui-widget-header {

src/app/stylesheets/widgets/env_select.scss → src/app/stylesheets/widgets/_env_select.scss

@@ -1,5 +1,7 @@
-@import "converge-ui/mixins";
-@import "converge-ui/colors";
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+
 
 .jbreadcrumb {
   list-style: none;

src/app/stylesheets/widgets/multiselect.scss → src/app/stylesheets/widgets/_multiselect.scss

@@ -1,4 +1,7 @@
-@import "converge-ui/base";
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+
 
 /*multi select*/
 .ui-multiselect { border: solid 1px #B5B5B5; font-size: 0.8em; @include border-radius(3px); }

src/app/stylesheets/widgets/scrollpane.scss → src/app/stylesheets/widgets/_scrollpane.scss

@@ -1,4 +1,7 @@
-@import "converge-ui/base";
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+
 
 .jspContainer {
   .jspHorizontalBar, .jspVerticalBar, .jspTrack { 

src/app/stylesheets/widgets/slidingtree.scss → src/app/stylesheets/widgets/_slidingtree.scss

@@ -1,5 +1,7 @@
-@import "converge-ui/colors";
-@import "converge-ui/sprites";
+@charset "UTF-8";
+@import "compass";
+@import "converge-ui/vars";
+
 
 .sliding_tree {
 

src/config/assets.yml

@@ -185,10 +185,9 @@ stylesheets:
     - public/stylesheets/jquery.treeTable.css
     - public/stylesheets/jquery.jscrollpane.css
     - public/stylesheets/jquery.tipsy.css
-    - public/stylesheets/compiled/katello.css
-    - public/stylesheets/compiled/sections/menu.css
-    - public/stylesheets/compiled/fancyqueries.css
     - public/stylesheets/compiled/widgets/tipsy_custom.css
+    - public/stylesheets/compiled/fancyqueries.css
+    - public/stylesheets/compiled/katello.css
   ie:
     - public/stylesheets/compiled/ie.css
   contents:

src/config/environments/development.rb

@@ -5,6 +5,7 @@
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the webserver when you make code changes.
   config.cache_classes = false
+  #switch the above to true if you're demoing.
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true