Merge pull request #7 from alanhogan/no-style-clobbering

Silo KSS-Rails styles
dewski · Aug 10, 2012 · 6a99d0f · 6a99d0f
2 parents c9bf1d5 + 7c5e0ec
commit 6a99d0f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/app/assets/stylesheets/kss.css.scss b/app/assets/stylesheets/kss.css.scss
@@ -33,7 +33,7 @@ body{
   font-size:14px;
 }
 
-header{
+.kss-header{
   padding:10px;
 
   font-size:16px;
@@ -43,24 +43,24 @@ header{
   border-bottom:1px solid #ddd;
 }
 
-#wrapper{
+#kss_wrapper{
   padding-left:200px;
   padding-right: 25px;
 }
 
-nav[role=main]{
+nav.kss-nav{
   float:left;
   margin-left:-200px;
   width:160px;
 }
-nav ul{
+nav.kss-nav>ul{
   margin-left:10px;
 }
-nav li{
+nav.kss-nav>ul>li{
   list-style-type:none;
   margin:10px 0;
 }
-nav li a{
+nav.kss-nav>ul>li>a{
   text-decoration:none;
   color:#666;
 }

diff --git a/lib/generators/templates/application.html.erb b/lib/generators/templates/application.html.erb
@@ -8,12 +8,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
   </head>
   <body>
-    <header>
+    <header class="kss-header">
       KSS Styleguide Example
     </header>
 
-    <div id="wrapper">
-      <nav role="main">
+    <div id="kss_wrapper">
+      <nav role="main" class="kss-nav">
         <ul>
           <li><%= link_to 'Home', kss.root_path %></li>
           <li><%= link_to 'Styleguide', kss.styleguide_path %></li>