Merge pull request #132 from mobywhale-chan/oocss-sass

Renamed components for issue #127 and #130. And modified box component.
stubbornella · Nov 5, 2012 · 00458f1 · 00458f1
2 parents 45d302c + e3fcaec
commit 00458f1
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git a/components-list.json b/components-list.json
@@ -26,9 +26,9 @@
             ]
         },
         {
-            "name":"alert",
-            "longname":"Alerts",
-            "path":"components/alert",
+            "name":"message",
+            "longname":"Messages",
+            "path":"components/message",
             "skins":[
                 {
                     "classname":"warn",
@@ -148,9 +148,9 @@
             "skins":[]
         },
         {
-            "name":"toggler",
-            "longname":"Toggler",
-            "path":"components/toggler",
+            "name":"toggle",
+            "longname":"Toggle",
+            "path":"components/toggle",
             "skins":[]
         },
         {

diff --git a/components/box/box.handlebars b/components/box/box.handlebars
@@ -1,6 +1,6 @@
 <div class="box {{classname}}">
     <div class="boxHead">
-        <h3 class="boxHead">{{title}}</h3>
+        <h3 class="boxHeading">{{title}}</h3>
     </div>
     <div class="boxBody">
         <p>{{body}}</p>

diff --git a/components/box/skin/_boxSimple.scss b/components/box/skin/_boxSimple.scss
@@ -1,4 +1,6 @@
-._boxSimple {
-    border: 1px solid #ccc;
-    background: 1px solid #555;
+@mixin ooBox() {
+    .boxSimple {
+        border: 1px solid #ccc;
+        background: 1px solid #555;
+    }
 }
diff --git a/components/alert/_alert.scss → components/message/_message.scss b/components/alert/_alert.scss → components/message/_message.scss
diff --git a/components/alert/alert.handlebars → components/message/message.handlebars b/components/alert/alert.handlebars → components/message/message.handlebars
diff --git a/components/alert/alert_doc.handlebars → components/message/message_doc.handlebars b/components/alert/alert_doc.handlebars → components/message/message_doc.handlebars
diff --git a/components/toggler/_toggler.scss → components/toggle/_toggle.scss b/components/toggler/_toggler.scss → components/toggle/_toggle.scss
diff --git a/components/toggler/toggler.handlebars → components/toggle/toggle.handlebars b/components/toggler/toggler.handlebars → components/toggle/toggle.handlebars
diff --git a/components/toggler/toggler_doc.handlebars → components/toggle/toggle_doc.handlebars b/components/toggler/toggler_doc.handlebars → components/toggle/toggle_doc.handlebars