fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add grouped buttons

This commit is contained in:
0ip 2012-05-20 15:29:10 +02:00
parent f3845c4020
commit fbee7dabcf
2 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/static/css/pad.css
View File

@ -41,14 +41,6 @@ a img {
border: 0 border: 0
} }
/* menu */ /* menu */
.toolbar ul {
position: relative;
list-style: none;
padding-right: 3px;
padding-left: 1px;
z-index: 2;
overflow: hidden;
}
.toolbar { .toolbar {
background: #f7f7f7; background: #f7f7f7;
background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%); background: -webkit-linear-gradient(#f7f7f7, #f1f1f1 80%);
@ -58,15 +50,34 @@ a img {
background: linear-gradient(#f7f7f7, #f1f1f1 80%); background: linear-gradient(#f7f7f7, #f1f1f1 80%);
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
overflow: hidden; overflow: hidden;
padding-top: 3px; padding-top: 4px;
width: 100%; width: 100%;
white-space: nowrap; white-space: nowrap;
height: 32px; 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 { .toolbar ul li {
float: left; float: left;
margin-left: 2px; margin-left: 2px;
} }
.toolbar ul li.separator {
border: inherit;
background: inherit;
visibility: hidden;
width: 0px;
padding: 5px;
}
.toolbar ul li a:hover { .toolbar ul li a:hover {
text-decoration: none; text-decoration: none;
} }
@ -93,13 +104,6 @@ a img {
-moz-box-shadow: 0 0 8px rgba(0,0,0,.1) inset; -moz-box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
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 { .toolbar ul li a {
background: #fff; background: #fff;
background: -webkit-linear-gradient(#fff, #f0f0f0); background: -webkit-linear-gradient(#fff, #f0f0f0);
@ -108,7 +112,7 @@ a img {
background: -ms-linear-gradient(#fff, #f0f0f0); background: -ms-linear-gradient(#fff, #f0f0f0);
background: linear-gradient(#fff, #f0f0f0); background: linear-gradient(#fff, #f0f0f0);
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 4px; border-radius: 3px;
color: #ccc; color: #ccc;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
@ -123,11 +127,26 @@ a img {
position: relative; position: relative;
top: 1px; top: 1px;
} }
.toolbar ul { .toolbar ul li a.grouped-left {
float: left border-radius: 3px 0 0 3px;
} }
.toolbar ul.menu_right { .toolbar ul li a.grouped-middle {
float: right 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 { #users {
display: none display: none
@ -135,7 +154,7 @@ a img {
#editorcontainer { #editorcontainer {
position: absolute; position: absolute;
width: 100%; width: 100%;
top: 36px; top: 37px; /* + 1px border */
left: 0px; left: 0px;
bottom: 0px; bottom: 0px;
z-index: 1; z-index: 1;
@ -866,14 +885,6 @@ input[type=checkbox] {
font-size: 11px; font-size: 11px;
font-weight: bold; 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 { .stickyChat {
background-color: #f1f1f1 !important; background-color: #f1f1f1 !important;
right: 0px !important; right: 0px !important;
@ -959,7 +970,7 @@ input[type=checkbox] {
margin: 0; margin: 0;
padding: 4px 8px; padding: 4px 8px;
} }
.selected { .toolbar ul li a.selected {
background: none !important background: none !important
} }
#chaticon, #timesliderlink { #chaticon, #timesliderlink {
@ -983,7 +994,7 @@ input[type=checkbox] {
bottom: 33px; bottom: 33px;
right: 0; right: 0;
} }
.separator { .toolbar ul li .separator {
display: none display: none
} }
#online_count { #online_count {

28
src/templates/pad.html
View File

@ -25,54 +25,54 @@
<ul class="menu_left"> <ul class="menu_left">
<% e.begin_block("editbarMenuLeft"); %> <% e.begin_block("editbarMenuLeft"); %>
<li id="bold" data-key="bold"> <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> <span class="buttonicon buttonicon-bold"></span>
</a> </a>
</li> </li>
<li id="italic" data-key="italic"> <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> <span class="buttonicon buttonicon-italic"></span>
</a> </a>
</li> </li>
<li id="underline" data-key="underline"> <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> <span class="buttonicon buttonicon-underline"></span>
</a> </a>
</li> </li>
<li id="strikethrough" data-key="strikethrough"> <li id="strikethrough" data-key="strikethrough">
<a title="Strikethrough"> <a class="grouped-right" title="Strikethrough">
<span class="buttonicon buttonicon-strikethrough"></span> <span class="buttonicon buttonicon-strikethrough"></span>
</a> </a>
</li> </li>
<li class="separator"></li> <li class="separator"></li>
<li id="oderedlist" data-key="insertorderedlist"> <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> <span class="buttonicon buttonicon-insertorderedlist"></span>
</a> </a>
</li> </li>
<li id="unoderedlist" data-key="insertunorderedlist"> <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> <span class="buttonicon buttonicon-insertunorderedlist"></span>
</a> </a>
</li> </li>
<li id="indent" data-key="indent"> <li id="indent" data-key="indent">
<a title="Indent"> <a class="grouped-middle" title="Indent">
<span class="buttonicon buttonicon-indent"></span> <span class="buttonicon buttonicon-indent"></span>
</a> </a>
</li> </li>
<li id="outdent" data-key="outdent"> <li id="outdent" data-key="outdent">
<a title="Unindent"> <a class="grouped-right" title="Unindent">
<span class="buttonicon buttonicon-outdent"></span> <span class="buttonicon buttonicon-outdent"></span>
</a> </a>
</li> </li>
<li class="separator"></li> <li class="separator"></li>
<li id="undo" data-key="undo"> <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> <span class="buttonicon buttonicon-undo"></span>
</a> </a>
</li> </li>
<li id="redo" data-key="redo"> <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> <span class="buttonicon buttonicon-redo"></span>
</a> </a>
</li> </li>
@ -87,22 +87,22 @@
<ul class="menu_right"> <ul class="menu_right">
<% e.begin_block("editbarMenuRight"); %> <% e.begin_block("editbarMenuRight"); %>
<li data-key="settings"> <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> <span class="buttonicon buttonicon-settings"></span>
</a> </a>
</li> </li>
<li data-key="import_export"> <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> <span class="buttonicon buttonicon-import_export"></span>
</a> </a>
</li> </li>
<li data-key="embed"> <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> <span class="buttonicon buttonicon-embed"></span>
</a> </a>
</li> </li>
<li data-key="savedRevision"> <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> <span class="buttonicon buttonicon-savedRevision"></span>
</a> </a>
</li> </li>