Merge pull request #1469 from bem/showcase.fixes

showcase: change the location of the progressbar
bem · Apr 21, 2015 · 2e0ec2f · 2e0ec2f
2 parents 2067344 + 2737d58
commit 2e0ec2f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/desktop.pages/showcase/blocks/link/link.styl b/desktop.pages/showcase/blocks/link/link.styl
@@ -9,3 +9,8 @@
         content: ' ❏';
     }
 }
+
+.radio-group_type_button ~ .link_type_docs
+{
+    margin-top: 20px;
+}
diff --git a/desktop.pages/showcase/blocks/progressbar-example/progressbar-example.styl b/desktop.pages/showcase/blocks/progressbar-example/progressbar-example.styl
@@ -1,6 +1,6 @@
 .progressbar-example
 {
-    margin-top: 10px;
+    margin-top: 30px;
 
     .button
     {

diff --git a/desktop.pages/showcase/showcase.bemjson.js b/desktop.pages/showcase/showcase.bemjson.js
@@ -179,7 +179,7 @@ module.exports = {
                                         { val : 3, text : 'Any colors' }
                                     ]
                                 },
-                                '<br><br>',
+                                { tag: 'br' },
                                 addLinkToDoc('spin'),
                                 {
                                     block : 'spin-container',
@@ -189,32 +189,11 @@ module.exports = {
                                             mods : { theme : 'islands', size : size, visible : true }
                                         };
                                     })
-                                },
-                                {
-                                    block: 'progressbar-example',
-                                    js: true,
-                                    content: [{
-                                        block : 'button',
-                                        mods : {
-                                            theme : 'islands',
-                                            size : 's',
-                                            togglable : 'check',
-                                            checked : true
-                                        },
-                                        text : 'Pause'
-                                    },
-                                    addLinkToDoc('progressbar'),
-                                    {
-                                        block : 'progressbar',
-                                        mods : { theme : 'islands' },
-                                        val : 25
-                                    }]
                                 }
                             ]
                         },
                         {
                             elem : 'cell',
-
                             content : [
                                 addLinkToDoc('select', '#mode', 'select_mode_radio-check'),
                                 {
@@ -261,6 +240,26 @@ module.exports = {
                                         text : 'Load image'
                                     },
                                     noFileText : 'file is not selected'
+                                },
+                                {
+                                    block: 'progressbar-example',
+                                    js: true,
+                                    content: [{
+                                        block : 'button',
+                                        mods : {
+                                            theme : 'islands',
+                                            size : 's',
+                                            togglable : 'check',
+                                            checked : true
+                                        },
+                                        text : 'Pause'
+                                    },
+                                    addLinkToDoc('progressbar'),
+                                    {
+                                        block : 'progressbar',
+                                        mods : { theme : 'islands' },
+                                        val : 95
+                                    }]
                                 }
                             ]
                         },