From fbee7dabcf5f35918952cae5190addf72161ee71 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Sun, 20 May 2012 15:29:10 +0200
Subject: [PATCH] Add grouped buttons

---
 src/static/css/pad.css | 75 ++++++++++++++++++++++++------------------
 src/templates/pad.html | 28 ++++++++--------
 2 files changed, 57 insertions(+), 46 deletions(-)

diff --git a/src/static/css/pad.css b/src/static/css/pad.css
index c98dabbd..4bf4159a 100644
--- a/src/static/css/pad.css
+++ b/src/static/css/pad.css
@@ -41,14 +41,6 @@ a img {
   border: 0
 }
 /* menu */
-.toolbar ul {
-  position: relative;
-  list-style: none;
-  padding-right: 3px;
-  padding-left: 1px;
-  z-index: 2;
-  overflow: hidden;
-}
 .toolbar {
   background: #f7f7f7;
   background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%);
@@ -58,15 +50,34 @@ a img {
   background: linear-gradient(#f7f7f7, #f1f1f1 80%);
   border-bottom: 1px solid #ccc;
   overflow: hidden;
-  padding-top: 3px;
+  padding-top: 4px;
   width: 100%;
   white-space: nowrap;
   height: 32px;
 }
+.toolbar ul {
+  position: relative;
+  list-style: none;
+  padding-right: 3px;
+  padding-left: 1px;
+  z-index: 2;
+  overflow: hidden;
+  float: left
+}
+.toolbar ul.menu_right {
+  float: right
+}
 .toolbar ul li {
   float: left;
   margin-left: 2px;
 }
+.toolbar ul li.separator {
+  border: inherit;
+  background: inherit;
+  visibility: hidden;
+  width: 0px;
+  padding: 5px;
+}
 .toolbar ul li a:hover {
   text-decoration: none;
 }
@@ -93,13 +104,6 @@ a img {
   -moz-box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
   box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
 }
-.toolbar ul li.separator {
-  border: inherit;
-  background: inherit;
-  visibility: hidden;
-  width: 0px;
-  padding: 5px;
-}
 .toolbar ul li a {
   background: #fff;
   background: -webkit-linear-gradient(#fff, #f0f0f0);
@@ -108,7 +112,7 @@ a img {
   background: -ms-linear-gradient(#fff, #f0f0f0);
   background: linear-gradient(#fff, #f0f0f0);
   border: 1px solid #ccc;
-  border-radius: 4px;
+  border-radius: 3px;
   color: #ccc;
   cursor: pointer;
   display: inline-block;
@@ -123,11 +127,26 @@ a img {
   position: relative;
   top: 1px;
 }
-.toolbar ul {
-  float: left
+.toolbar ul li a.grouped-left {
+  border-radius: 3px 0 0 3px;
 }
-.toolbar ul.menu_right {
-  float: right
+.toolbar ul li a.grouped-middle {
+  border-radius: 0;
+  margin-left: -2px;
+  border-left: 0;
+}
+.toolbar ul li a.grouped-right {
+  border-radius: 0 3px 3px 0;
+  margin-left: -2px;
+  border-left: 0;
+}
+.toolbar ul li a.selected {
+  background: #eee !important;
+  background: -webkit-linear-gradient(#EEE, #F0F0F0) !important;
+  background: -moz-linear-gradient(#EEE, #F0F0F0) !important;
+  background: -o-linear-gradient(#EEE, #F0F0F0) !important;
+  background: -ms-linear-gradient(#EEE, #F0F0F0) !important;
+  background: linear-gradient(#EEE, #F0F0F0) !important;
 }
 #users {
   display: none
@@ -135,7 +154,7 @@ a img {
 #editorcontainer {
   position: absolute;
   width: 100%;
-  top: 36px;
+  top: 37px; /* + 1px border */
   left: 0px;
   bottom: 0px;
   z-index: 1;
@@ -866,14 +885,6 @@ input[type=checkbox] {
   font-size: 11px;
   font-weight: bold;
 }
-.selected {
-  background: #eee !important;
-  background: -webkit-linear-gradient(#EEE, #F0F0F0) !important;
-  background: -moz-linear-gradient(#EEE, #F0F0F0) !important;
-  background: -o-linear-gradient(#EEE, #F0F0F0) !important;
-  background: -ms-linear-gradient(#EEE, #F0F0F0) !important;
-  background: linear-gradient(#EEE, #F0F0F0) !important;
-}
 .stickyChat {
   background-color: #f1f1f1 !important;
   right: 0px !important;
@@ -959,7 +970,7 @@ input[type=checkbox] {
       margin: 0;
       padding: 4px 8px;
     }
-    .selected {
+    .toolbar ul li a.selected {
       background: none !important
     }
     #chaticon, #timesliderlink {
@@ -983,7 +994,7 @@ input[type=checkbox] {
       bottom: 33px;
       right: 0;
     }
-    .separator {
+    .toolbar ul li .separator {
       display: none
     }
     #online_count {
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 6b527e2a..d126ba5d 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -25,54 +25,54 @@
             <ul class="menu_left">
                 <% e.begin_block("editbarMenuLeft"); %>
                 <li id="bold" data-key="bold">
-                    <a title="Bold (ctrl-B)">
+                    <a class="grouped-left" title="Bold (ctrl-B)">
                       <span class="buttonicon buttonicon-bold"></span>
                     </a>
                 </li>
                 <li id="italic" data-key="italic">
-                    <a title="Italics (ctrl-I)">
+                    <a class="grouped-middle" title="Italics (ctrl-I)">
                       <span class="buttonicon buttonicon-italic"></span>
                     </a>
                 </li>
                 <li id="underline" data-key="underline">
-                    <a title="Underline (ctrl-U)">
+                    <a class="grouped-middle" title="Underline (ctrl-U)">
                       <span class="buttonicon buttonicon-underline"></span>
                     </a>
                 </li>
                 <li id="strikethrough" data-key="strikethrough">
-                    <a title="Strikethrough">
+                    <a class="grouped-right" title="Strikethrough">
                       <span class="buttonicon buttonicon-strikethrough"></span>
                     </a>
                 </li>
                 <li class="separator"></li>
                 <li id="oderedlist" data-key="insertorderedlist">
-                    <a title="Toggle Ordered List">
+                    <a class="grouped-left" class="grouped-left" title="Toggle Ordered List">
                       <span class="buttonicon buttonicon-insertorderedlist"></span>
                     </a>
                 </li>
                 <li id="unoderedlist" data-key="insertunorderedlist">
-                    <a title="Toggle Bullet List">
+                    <a class="grouped-middle" title="Toggle Bullet List">
                       <span class="buttonicon buttonicon-insertunorderedlist"></span>
                     </a>
                 </li>
                 <li id="indent" data-key="indent">
-                    <a title="Indent">
+                    <a class="grouped-middle" title="Indent">
                       <span class="buttonicon buttonicon-indent"></span>
                     </a>
                 </li>
                 <li id="outdent" data-key="outdent">
-                    <a title="Unindent">
+                    <a class="grouped-right" title="Unindent">
                       <span class="buttonicon buttonicon-outdent"></span>
                     </a>
                 </li>
                 <li class="separator"></li>
                 <li id="undo" data-key="undo">
-                    <a title="Undo (ctrl-Z)">
+                    <a class="grouped-left" title="Undo (ctrl-Z)">
                       <span class="buttonicon buttonicon-undo"></span>
                     </a>
                 </li>
                 <li id="redo" data-key="redo">
-                    <a title="Redo (ctrl-Y)">
+                    <a class="grouped-right" title="Redo (ctrl-Y)">
                       <span class="buttonicon buttonicon-redo"></span>
                     </a>
                 </li>
@@ -87,22 +87,22 @@
             <ul class="menu_right">
                 <% e.begin_block("editbarMenuRight"); %>
                 <li data-key="settings">
-                    <a id="settingslink" title="Settings of this pad">
+                    <a class="grouped-left" id="settingslink" title="Settings of this pad">
                         <span class="buttonicon buttonicon-settings"></span>
                     </a>
                 </li>
                 <li data-key="import_export">
-                    <a id="importexportlink" title="Import/Export from/to different document formats">
+                    <a class="grouped-middle" id="importexportlink" title="Import/Export from/to different document formats">
                         <span class="buttonicon buttonicon-import_export"></span>
                     </a>
                 </li>
                 <li data-key="embed">
-                    <a id="embedlink" title="Share and Embed this pad">
+                    <a class="grouped-middle" id="embedlink" title="Share and Embed this pad">
                         <span class="buttonicon buttonicon-embed"></span>
                     </a>
                 </li>
                 <li data-key="savedRevision">
-                    <a id="revisionlink" title="Mark this revision as a saved revision">
+                    <a class="grouped-right" id="revisionlink" title="Mark this revision as a saved revision">
                         <span class="buttonicon buttonicon-savedRevision"></span>
                     </a>
                 </li>