diff --git a/public/cache.manifest b/public/cache.manifest index 2cfe63f6..9147e2b3 100644 --- a/public/cache.manifest +++ b/public/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Mon Dec 02 2013 01:20:12 +#Date Mon Dec 02 2013 02:38:48 CACHE: res/worker.js diff --git a/public/res-min/themes/default.css b/public/res-min/themes/default.css index 28715728..3ca1f27d 100644 --- a/public/res-min/themes/default.css +++ b/public/res-min/themes/default.css @@ -1419,9 +1419,9 @@ a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba .navbar .nav.pull-right{float:right}.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}.navbar .nav.pull-right>li>.dropdown-menu .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0} .navbar .btn{height:38px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(45,64,83,0.3)} -.navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;max-width:280px;overflow:hidden;white-space:nowrap} +.navbar .file-title-navbar{display:inline-block;vertical-align:middle;padding:4px 15px;font-size:20px;font-weight:200;max-width:280px;overflow:hidden;white-space:nowrap} .navbar .input-file-title{margin-right:10px} -.navbar .working-indicator{overflow:hidden;height:38px;width:65px;padding-top:8px}.navbar .working-indicator .bar{display:inline-block;width:10px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#2d4053;animation:indicator .6s ease-out infinite;-webkit-animation:indicator .6s ease-out infinite;} +.navbar .working-indicator{display:inline-block;vertical-align:middle;overflow:hidden;height:38px;width:65px;padding-top:9px}.navbar .working-indicator .bar{display:inline-block;width:10px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#2d4053;animation:indicator .6s ease-out infinite;-webkit-animation:indicator .6s ease-out infinite;} .navbar .left-buttons-dropdown>.nav,.navbar .right-buttons-dropdown>.nav{margin-left:0;margin-right:0} .navbar div.dropdown-menu{top:initial;padding:5px} @keyframes indicator{from{opacity:1} to{opacity:0.25}}@-webkit-keyframes indicator /* Safari and Chrome */{from{opacity:1} to{opacity:0.25}}.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial}.menu-panel .collapse-button,.document-panel .collapse-button{background-color:#fff;height:38px;border-radius:8px;-webkit-box-shadow:0 0 1px rgba(0,0,0,.5);box-shadow:0 0 1px rgba(0,0,0,.5)}.menu-panel .collapse-button:active,.document-panel .collapse-button:active{-webkit-box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5);box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5)} @@ -1451,6 +1451,9 @@ a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba .modal-document-manager .checkbox{float:right;margin:0;padding:0;cursor:pointer}.modal-document-manager .checkbox input{cursor:pointer;margin:0 16px;height:38px} .modal-document-manager .input-rename{width:220px} .modal-document-manager .name,.modal-document-manager .file-count{padding:9px 20px 9px 15px} +.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-editor-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-editor-buttons>.btn-group>.btn{border-radius:0} +.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-editor-buttons>.btn-group:first-child>.btn,.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-editor-buttons>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px} +.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-editor-buttons>.btn-group:last-child>.btn,.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-editor-buttons>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px} .extension-preview-buttons{position:absolute;z-index:1;margin-top:6px;right:30px}.ui-layout-resizer-south-closed .extension-preview-buttons{display:none !important} .extension-preview-buttons .btn-group .btn{position:initial} .extension-preview-buttons .dropdown-menu{padding-bottom:20px} diff --git a/public/res-min/themes/gray.css b/public/res-min/themes/gray.css index 03b63049..45853bf0 100644 --- a/public/res-min/themes/gray.css +++ b/public/res-min/themes/gray.css @@ -1419,9 +1419,9 @@ a.list-group-item:hover,a.list-group-item:focus{color:#343434;border-top-color:r .navbar .nav.pull-right{float:right}.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}.navbar .nav.pull-right>li>.dropdown-menu .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0} .navbar .btn{height:38px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(64,64,64,0.3)} -.navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;max-width:280px;overflow:hidden;white-space:nowrap} +.navbar .file-title-navbar{display:inline-block;vertical-align:middle;padding:4px 15px;font-size:20px;font-weight:200;max-width:280px;overflow:hidden;white-space:nowrap} .navbar .input-file-title{margin-right:10px} -.navbar .working-indicator{overflow:hidden;height:38px;width:65px;padding-top:8px}.navbar .working-indicator .bar{display:inline-block;width:10px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#404040;animation:indicator .6s ease-out infinite;-webkit-animation:indicator .6s ease-out infinite;} +.navbar .working-indicator{display:inline-block;vertical-align:middle;overflow:hidden;height:38px;width:65px;padding-top:9px}.navbar .working-indicator .bar{display:inline-block;width:10px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#404040;animation:indicator .6s ease-out infinite;-webkit-animation:indicator .6s ease-out infinite;} .navbar .left-buttons-dropdown>.nav,.navbar .right-buttons-dropdown>.nav{margin-left:0;margin-right:0} .navbar div.dropdown-menu{top:initial;padding:5px} @keyframes indicator{from{opacity:1} to{opacity:0.25}}@-webkit-keyframes indicator /* Safari and Chrome */{from{opacity:1} to{opacity:0.25}}.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial}.menu-panel .collapse-button,.document-panel .collapse-button{background-color:#fff;height:38px;border-radius:8px;-webkit-box-shadow:0 0 1px rgba(0,0,0,.5);box-shadow:0 0 1px rgba(0,0,0,.5)}.menu-panel .collapse-button:active,.document-panel .collapse-button:active{-webkit-box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5);box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5)} @@ -1451,6 +1451,9 @@ a.list-group-item:hover,a.list-group-item:focus{color:#343434;border-top-color:r .modal-document-manager .checkbox{float:right;margin:0;padding:0;cursor:pointer}.modal-document-manager .checkbox input{cursor:pointer;margin:0 16px;height:38px} .modal-document-manager .input-rename{width:220px} .modal-document-manager .name,.modal-document-manager .file-count{padding:9px 20px 9px 15px} +.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-editor-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-editor-buttons>.btn-group>.btn{border-radius:0} +.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-editor-buttons>.btn-group:first-child>.btn,.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-editor-buttons>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px} +.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-editor-buttons>.btn-group:last-child>.btn,.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-editor-buttons>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px} .extension-preview-buttons{position:absolute;z-index:1;margin-top:6px;right:30px}.ui-layout-resizer-south-closed .extension-preview-buttons{display:none !important} .extension-preview-buttons .btn-group .btn{position:initial} .extension-preview-buttons .dropdown-menu{padding-bottom:20px} diff --git a/public/res-min/themes/night.css b/public/res-min/themes/night.css index b3e7cde7..447ffee1 100644 --- a/public/res-min/themes/night.css +++ b/public/res-min/themes/night.css @@ -1419,9 +1419,9 @@ a.list-group-item:hover,a.list-group-item:focus{color:#b3b3b3;border-top-color:r .navbar .nav.pull-right{float:right}.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}.navbar .nav.pull-right>li>.dropdown-menu .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0} .navbar .btn{height:38px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(191,191,191,0.3)} -.navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;max-width:280px;overflow:hidden;white-space:nowrap} +.navbar .file-title-navbar{display:inline-block;vertical-align:middle;padding:4px 15px;font-size:20px;font-weight:200;max-width:280px;overflow:hidden;white-space:nowrap} .navbar .input-file-title{margin-right:10px} -.navbar .working-indicator{overflow:hidden;height:38px;width:65px;padding-top:8px}.navbar .working-indicator .bar{display:inline-block;width:10px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#bfbfbf;animation:indicator .6s ease-out infinite;-webkit-animation:indicator .6s ease-out infinite;} +.navbar .working-indicator{display:inline-block;vertical-align:middle;overflow:hidden;height:38px;width:65px;padding-top:9px}.navbar .working-indicator .bar{display:inline-block;width:10px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#bfbfbf;animation:indicator .6s ease-out infinite;-webkit-animation:indicator .6s ease-out infinite;} .navbar .left-buttons-dropdown>.nav,.navbar .right-buttons-dropdown>.nav{margin-left:0;margin-right:0} .navbar div.dropdown-menu{top:initial;padding:5px} @keyframes indicator{from{opacity:1} to{opacity:0.25}}@-webkit-keyframes indicator /* Safari and Chrome */{from{opacity:1} to{opacity:0.25}}.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial}.menu-panel .collapse-button,.document-panel .collapse-button{background-color:#aaa;height:38px;border-radius:8px;-webkit-box-shadow:0 0 1px rgba(0,0,0,.5);box-shadow:0 0 1px rgba(0,0,0,.5)}.menu-panel .collapse-button:active,.document-panel .collapse-button:active{-webkit-box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5);box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5)} @@ -1451,6 +1451,9 @@ a.list-group-item:hover,a.list-group-item:focus{color:#b3b3b3;border-top-color:r .modal-document-manager .checkbox{float:right;margin:0;padding:0;cursor:pointer}.modal-document-manager .checkbox input{cursor:pointer;margin:0 16px;height:38px} .modal-document-manager .input-rename{width:220px} .modal-document-manager .name,.modal-document-manager .file-count{padding:9px 20px 9px 15px} +.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-editor-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-editor-buttons>.btn-group>.btn{border-radius:0} +.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-editor-buttons>.btn-group:first-child>.btn,.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-editor-buttons>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px} +.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-editor-buttons>.btn-group:last-child>.btn,.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-editor-buttons>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px} .extension-preview-buttons{position:absolute;z-index:1;margin-top:6px;right:30px}.ui-layout-resizer-south-closed .extension-preview-buttons{display:none !important} .extension-preview-buttons .btn-group .btn{position:initial} .extension-preview-buttons .dropdown-menu{padding-bottom:20px} diff --git a/public/res-min/themes/school.css b/public/res-min/themes/school.css index 358062df..407bd991 100644 --- a/public/res-min/themes/school.css +++ b/public/res-min/themes/school.css @@ -1419,9 +1419,9 @@ a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba .navbar .nav.pull-right{float:right}.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}.navbar .nav.pull-right>li>.dropdown-menu .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0} .navbar .btn{height:38px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(238,238,238,0.3)} -.navbar .file-title-navbar{display:block;padding:4px 15px;font-size:20px;font-weight:200;max-width:280px;overflow:hidden;white-space:nowrap} +.navbar .file-title-navbar{display:inline-block;vertical-align:middle;padding:4px 15px;font-size:20px;font-weight:200;max-width:280px;overflow:hidden;white-space:nowrap} .navbar .input-file-title{margin-right:10px} -.navbar .working-indicator{overflow:hidden;height:38px;width:65px;padding-top:8px}.navbar .working-indicator .bar{display:inline-block;width:10px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#eee;animation:indicator .6s ease-out infinite;-webkit-animation:indicator .6s ease-out infinite;} +.navbar .working-indicator{display:inline-block;vertical-align:middle;overflow:hidden;height:38px;width:65px;padding-top:9px}.navbar .working-indicator .bar{display:inline-block;width:10px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#eee;animation:indicator .6s ease-out infinite;-webkit-animation:indicator .6s ease-out infinite;} .navbar .left-buttons-dropdown>.nav,.navbar .right-buttons-dropdown>.nav{margin-left:0;margin-right:0} .navbar div.dropdown-menu{top:initial;padding:5px} @keyframes indicator{from{opacity:1} to{opacity:0.25}}@-webkit-keyframes indicator /* Safari and Chrome */{from{opacity:1} to{opacity:0.25}}.menu-panel,.document-panel{display:block;position:absolute;top:0;height:100%;z-index:10;overflow:initial}.menu-panel .collapse-button,.document-panel .collapse-button{background-color:#fff;height:38px;border-radius:8px;-webkit-box-shadow:0 0 1px rgba(0,0,0,.5);box-shadow:0 0 1px rgba(0,0,0,.5)}.menu-panel .collapse-button:active,.document-panel .collapse-button:active{-webkit-box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5);box-shadow:inset 0 3px 5px rgba(0, 0, 0, 0.125), 0 0 1px rgba(0,0,0,.5)} @@ -1451,6 +1451,9 @@ a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba .modal-document-manager .checkbox{float:right;margin:0;padding:0;cursor:pointer}.modal-document-manager .checkbox input{cursor:pointer;margin:0 16px;height:38px} .modal-document-manager .input-rename{width:220px} .modal-document-manager .name,.modal-document-manager .file-count{padding:9px 20px 9px 15px} +.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-editor-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-editor-buttons>.btn-group>.btn{border-radius:0} +.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-editor-buttons>.btn-group:first-child>.btn,.extension-buttons>.btn-group:first-child>.btn,.extension-preview-buttons>.btn-group:first-child>.btn,.extension-editor-buttons>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px} +.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-editor-buttons>.btn-group:last-child>.btn,.extension-buttons>.btn-group:last-child>.btn,.extension-preview-buttons>.btn-group:last-child>.btn,.extension-editor-buttons>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px} .extension-preview-buttons{position:absolute;z-index:1;margin-top:6px;right:30px}.ui-layout-resizer-south-closed .extension-preview-buttons{display:none !important} .extension-preview-buttons .btn-group .btn{position:initial} .extension-preview-buttons .dropdown-menu{padding-bottom:20px} diff --git a/public/res/styles/main.less b/public/res/styles/main.less index 320d4a48..fd8ec56e 100644 --- a/public/res/styles/main.less +++ b/public/res/styles/main.less @@ -421,7 +421,8 @@ a { } .file-title-navbar { - display: block; + display: inline-block; + vertical-align: middle; padding: 4px 15px; font-size: 20px; font-weight: 200; @@ -435,10 +436,12 @@ a { } .working-indicator { + display: inline-block; + vertical-align: middle; overflow: hidden; height: @input-height-base; width: 65px; - padding-top: 8px; + padding-top: 9px; .bar { display: inline-block; width: 10px; @@ -694,9 +697,29 @@ a { /******************** - * Preview/Editor extensions buttons + * Extensions buttons ********************/ +// Hack to align multiple btn-group +.extension-buttons > .btn-group, +.extension-preview-buttons > .btn-group, +.extension-editor-buttons > .btn-group { + & > .btn, + & > .btn { + border-radius: 0; + } + &:first-child > .btn, + &:first-child > .btn { + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + } + &:last-child > .btn, + &:last-child > .btn { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + } +} + .extension-preview-buttons { position: absolute; z-index: 1;