hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

update favicons, fix ie8 issues in workzone, misc css fixes

Browse Source
This commit is contained in:
Florian BLOUET
2015-11-25 12:40:21 +01:00
parent 0194e1b46a
commit 170f1bd80d
21 changed files with 264 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/www/authentication/images/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
resources/www/prod/images/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

6
resources/www/prod/skins/skin-shared.scss
View File

@@ -361,9 +361,7 @@ span.ww_winTitle {
#order_manager .order_list li {
display: inline-block;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
border-radius: $defaultBorderRadius;
border: 1px solid #FFFFFF;
margin: 0 5px;
}
@@ -465,7 +463,7 @@ H4 {
border: 2px solid $darkerBorderColor;
padding: 0px;
color: $darkerTextColor;
border-radius: 4px;
border-radius: $defaultBorderRadius;
}
.popover-inner .popover-title {

3
resources/www/prod/skins/ui-components/_buttons.scss
View File

@@ -26,7 +26,7 @@
// not used:
.history-collection {
/*.history-collection {
background-image: url('#{$iconsPath}chgcoll_history.png');
}
@@ -69,3 +69,4 @@ only screen and (min-resolution: 120dpi)
background-size: 16px 16px;
}
}
*/

4
resources/www/prod/skins/ui-components/_colorpicker.scss
View File

@@ -34,9 +34,7 @@ $colorpickerFocusBorder: #999999;
}
.colorpicker_focus {
border: 1px solid $colorpickerFocusBorder;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 2px;
border-radius: $defaultBorderRadius;
}
.colorpicker_current_color,
.colorpicker_field,

8
resources/www/prod/skins/ui-components/_context-menu.scss
View File

@@ -62,12 +62,8 @@ Menu contextuel
.context-menu-theme-vista {
background-image: none;
background-color: #212121;
-webkit-border-bottom-left-radius: 3px;
-webkit-border-bottom-right-radius: 3px;
-moz-border-radius-bottomleft: 3px;
-moz-border-radius-bottomright: 3px;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: $defaultBorderRadius;
border-bottom-right-radius: $defaultBorderRadius;
}
.context-menu-theme-vista .context-menu-item .context-menu-item-inner.published {

4
resources/www/prod/skins/ui-components/_diapo.scss
View File

@@ -32,9 +32,7 @@ $diapoBorderColor: $darkerBorderColor !default;
display: block;
float: left;
border: 1px solid $diapoBorderColor;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
border-radius: $defaultBorderRadius;
text-align: center;
margin: 8px 5px;
&.selected {

48
resources/www/prod/skins/ui-components/_modal-edit.scss
View File

@@ -7,6 +7,14 @@
left: 0;
right: 0;
bottom: 0;
.content-wrapper {
margin: 10px;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
}
}
#EDIT_TOP {
@@ -16,9 +24,7 @@
left: 0;
width: 100%;
overflow: visible;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
border-radius: $defaultBorderRadius;
}
#EDIT_MENU {
@@ -83,9 +89,7 @@
background-color: $mediumBackgroundColor;
width: 700px;
left: 0;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
border-radius: $defaultBorderRadius;
}
#EDIT_MID_R {
@@ -451,11 +455,29 @@ div.thesaurus {
cursor: pointer;
}
}
}
#idFrameE .ui-tabs {
position: absolute;
top: 0px;
left: 10px;
bottom: 0px;
right: 0;
.ui-tabs {
position: absolute;
top: 0px;
left: 10px;
bottom: 0px;
right: 0;
.ui-tabs-nav {
background-color: transparent;
top: 0px;
left: 10px;
right: 10px;
margin-top: 21px;
border-top: 1px solid $workzoneTabBorderTop;
border-radius: 0;
height: 43px;
border-bottom: 1px solid $workzoneTabBorderBottom;
}
.ui-tabs-panel {
position: absolute;
top: 56px;
left: 0;
bottom: 0;
right: 0;
}
}
}

4
resources/www/prod/skins/ui-components/_modal-export.scss
View File

@@ -2,9 +2,7 @@
#printBox {
background-color: $mediumBackgroundColor;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
border-radius: $defaultBorderRadius;
}
#printBox h4, #download h4,

9
resources/www/prod/skins/ui-components/_modal-preview.scss
View File

@@ -1,9 +1,10 @@
#PREVIEWBOX, #EDITWINDOW {
z-index: 1200;
background-color: $darkerBackgroundColor;
background-color: $modalBackground;
display: none;
border: 2px solid $darkerBorderColor;
border: $modalBorder; //1px solid $darkerBorderColor;
border-radius: $defaultBorderRadius;
}
#PREVIEWBOX img {
@@ -82,9 +83,7 @@
#PREVIEWOTHERSINNER li.otherRegToolTip,
#PREVIEWOTHERSINNER li.otherBaskToolTip {
background-color: $mediumBackgroundColor;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
border-radius: $defaultBorderRadius;
cursor: pointer;
}

2
resources/www/prod/skins/ui-components/_modal-push.scss
View File

@@ -329,7 +329,7 @@
#QuickAddUser input {
border: 1px solid #CCCCCC;
border-radius: 4px 4px 4px 4px;
border-radius: $defaultBorderRadius;
box-shadow: 0 1px 1px #EEEEEE;
display: inline-block;
margin: 0 5px 0 0;

4
resources/www/prod/skins/ui-components/_pagination.scss
View File

@@ -7,9 +7,7 @@
padding: 1px 5px;
margin: 0 4px;
background-color: #0077BC;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
border-radius: $defaultBorderRadius;
font-size: 12px;
line-height: 14px;
font-weight: bold;

11
resources/www/prod/skins/ui-components/_search-form.scss
View File

@@ -78,9 +78,7 @@ form.phrasea_query input.query {
#adv_search .sbasglob .sbas_list,
.adv_options .sbasglob .sbas_list {
padding: 5px 0;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
border-radius: $defaultBorderRadius;
}
#adv_search .sbasglob .sbas_list.selected,
@@ -95,13 +93,6 @@ form.phrasea_query input.query {
text-align: center;
}
/*.sbaslist {
background-color: $searchSbasListBg;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}*/
.sbas_list label {
color: $lightTextColor;
}

360
resources/www/prod/skins/ui-components/_workzone-baskets.scss
View File

@@ -1,259 +1,129 @@
/* workzone brower - DEPRECATED - #BasketBrowser {
h1 {
font-size: 14px;
line-height: 20px;
margin: 0;
padding: 0;
}
.Browser{
background-color: #111111;
}
.Basket{
background-color: #111111;
display:none;
.thumb_wrapper {
margin:5px;
#idFrameC {
#baskets {
> div {
border-top: 1px solid $mediumBorderColor;
}
}
.result{
position:relative;
height:100px;
&.odd{
background-color:#404040;
}
.PNB10 {
overflow: hidden;
}
.datas{
top:50px;
bottom:50px;
overflow-y:auto;
overflow-x:hidden;
}
.footer,
.header{
height:50px;
}
.header{
bottom:auto;
}
.footer{
top:auto;
}
table{
height:80px;
}
td {
&.content{
width:390px;
vertical-align:top;
}
&.thumbnail{
display: table-cell;
width: 105px;
height: 80px;
padding: 0;
border: none;
border-radius: 0;
box-shadow: none;
line-height: 18px;
text-align: center;
vertical-align:top;
.counter{
bottom: 18px;
font-size: 14px;
position: relative;
right: 5px;
text-align: right;
}
.bloc {
position: absolute;
top: 31px;
left: 0pt;
right: 1px;
bottom: 0px;
overflow-y: auto;
overflow-x: hidden;
&.groupDrop {
border: 3px solid #a00;
}
}
}
h1.title{
font-size:14px;
.loader{
display:none;
margin:4px;
}
}
img{
vertical-align: middle;
}
table{
width:100%;
border:none;
vertical-align:top;
td.paginator{
text-align:right;
}
}
label {
cursor:pointer;
color:#9a9a9a;
}
input {
display:none;
&.Query {
padding: 3px;
display: block;
border-radius: 4px;
width: 155px;
padding-left: 25px;
}
}
input:checked + label,
label.selected {
color: #d18827;
}
form {
h1{
margin:10px 0;
}
ul {
li{
padding:5px 0;
border-top:1px solid #9A9A9A;
&.first{
border-top:none;
}
label{
margin: 0 0 0 40px;
}
.content {
&.grouping .alert_datas_changed,
&.basket .alert_datas_changed {
position: relative;
margin: 10px 0;
right: 0;
left: 0;
}
}
}
}*/
#idFrameC #baskets .alert_datas_changed {
position: absolute;
top: 5px;
height: 20px;
right: 26px;
left: 10px;
background-color: $workzoneBasketAlertDataBg;
color: $workzoneBasketAlertDataColor;
text-align: center;
font-weight: bold;
font-size: 12px;
display: none;
z-index: 5000;
}
#idFrameC #baskets .content.grouping .alert_datas_changed,
#idFrameC #baskets .content.basket .alert_datas_changed {
position: relative;
margin: 10px 0;
right: 0;
left: 0;
}
#idFrameC #baskets .bloc {
position: absolute;
top: 31px;
left: 0pt;
right: 1px;
bottom: 0px;
overflow-y: auto;
overflow-x: hidden;
}
#baskets .insidebloc {
top: 0;
}
#baskets .top-scroller,
#baskets .bottom-scroller {
height: 80px;
position: absolute;
border: none;
top: 0px;
bottom: 0;
left: 0;
right: 0;
}
#baskets .top-scroller {
bottom: auto;
}
#baskets .bottom-scroller {
top: auto;
}
#idFrameC #baskets .bloc.groupDrop {
border: 3px solid #a00;
}
#baskets {
> div {
border-top: 1px solid $mediumBorderColor;
}
.SSTT {
&.active {
border: 1px solid #b1b1b1;
&.ui-corner-top {
border: none;
border-top: 1px solid $mediumBorderColor;
top: 0;
background-color: $mediumBackgroundColor;
}
}
&.grouping {
&.active {
// border: 1px solid #2f4a6f;
&.ui-corner-top {
border-bottom: none;
}
}
}
.title {
overflow: hidden;
left: 30px;
right: 40px;
height: 16px;
margin: 2px 0;
.alert_datas_changed {
position: absolute;
top: 5px;
height: 20px;
right: 26px;
left: 10px;
background-color: $workzoneBasketAlertDataBg;
color: $workzoneBasketAlertDataColor;
text-align: center;
font-weight: bold;
font-size: 12px;
display: none;
z-index: 5000;
}
.insidebloc {
top: 0;
}
.top-scroller, .bottom-scroller {
height: 80px;
position: absolute;
border: none;
top: 0px;
bottom: 0;
left: 0;
right: 0;
}
.top-scroller {
bottom: auto;
}
.bottom-scroller {
top: auto;
}
.SSTT {
&.active {
border: 1px solid #b1b1b1;
&.ui-corner-top {
border: none;
border-top: 1px solid $mediumBorderColor;
top: 0;
background-color: $mediumBackgroundColor;
}
}
&.grouping {
&.active {
// border: 1px solid #2f4a6f;
&.ui-corner-top {
border-bottom: none;
}
}
}
.title {
overflow: hidden;
left: 30px;
right: 40px;
height: 16px;
margin: 2px 0;
font-size: 12px;
}
.menu {
text-align: right;
position: absolute;
right: 0;
top: 0;
padding: 3px;
margin: 0 5px 0 0;
table td {
width: 20px;
}
}
.workzone-menu-title {
text-overflow: ellipsis;
padding-right: 65px;
overflow: hidden;
white-space: nowrap;
display: block;
}
img {
max-height: 18px;
vertical-align: middle;
cursor: help;
margin-right: 9px;
}
}
.menu {
text-align: right;
position: absolute;
right: 0;
top: 0;
padding: 3px;
margin: 0 5px 0 0;
table td {
width: 20px;
.contextMenuTrigger {
cursor: pointer;
display: block;
padding: 0;
margin: 0;
background: url('#{$iconsPath}contextMenuTrigger.png') 0 13px no-repeat;
height: 45px;
width: 13px;
}
}
.workzone-menu-title {
text-overflow: ellipsis;
padding-right: 65px;
overflow: hidden;
white-space: nowrap;
display: block;
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
color: $textPrimaryActiveColor;
font-size: 1em;
}
img {
max-height: 18px;
vertical-align: middle;
cursor: help;
margin-right: 9px;
}
}
.menu {
.contextMenuTrigger {
cursor: pointer;
display: block;
padding: 0;
margin: 0;
background: url('#{$iconsPath}contextMenuTrigger.png') 0 13px no-repeat;
height: 45px;
width: 13px;
}
}
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
color: $textPrimaryActiveColor;
font-size: 1em;
}
}

35
resources/www/prod/skins/ui-components/_workzone-thesaurus.scss
View File

@@ -80,10 +80,37 @@
/* ==================================
dans l'onglet thesaurus : arbres, menus contextuels
===================================== */
.ui-tabs {
#thesaurus_tab {
top: 87px !important;
}
}
#THPD_tabs {
right: 0;
.ui-tabs-nav {
li.th_tab {
a {
color: $textPrimaryColor;
}
&.th_tab {
height: 43px;
margin: 0;
.ui-state-active {
border-bottom: 1px solid $thesaurusColor;
}
a {
height: 43px;
line-height: 43px;
vertical-align: middle;
margin: 0;
padding: 0 20px;
display: block;
text-decoration: none;
}
}
}
.ui-state-default A {
color: $thesaurusContextMenuColor;
}
@@ -137,9 +164,15 @@ dans l'onglet thesaurus : arbres, menus contextuels
background-color: #ff0000;
}
}
#idFrameC .ui-tabs {
#THPD_C.ui-tabs-panel,
#THPD_T.ui-tabs-panel{
top: 46px;
}
}
#THPD_T, #THPD_C {
margin-top: 10px;
// margin-top: 10px;
margin-left: 0px;
}

63
resources/www/prod/skins/ui-components/_workzone.scss
View File

@@ -33,7 +33,18 @@
left: 0px;
bottom: 0px;
right: 0;
margin: 0;
padding: 0;
.ui-tabs-nav {
background-color: transparent;
top: 0;
left: 10px;
right: 10px;
//margin-top: 21px;
border-top: 1px solid $workzoneTabBorderTop;
border-radius: 0;
height: 43px;
border-bottom: 1px solid $workzoneTabBorderBottom;
li {
width: auto;
height: 85px;
@@ -41,6 +52,7 @@
background-color: $mediumBackgroundColor;
z-index: 10;
border-radius: 0;
margin: 0;
&.proposals_WZ {
&.ui-state-active {
a {
@@ -89,29 +101,14 @@
}
}
}
#thesaurus_tab {
li {
a {
color: $textPrimaryColor;
}
&.th_tab {
height: 43px;
margin: 0;
.ui-state-active {
border-bottom: 1px solid $thesaurusColor;
}
a {
height: 43px;
line-height: 43px;
vertical-align: middle;
margin: 0;
padding: 0 20px;
display: block;
text-decoration: none;
}
}
}
.ui-tabs-panel {
position: absolute;
top: 56px;
left: 0;
bottom: 0;
right: 0;
}
}
ul.icon-menu {
width: 100%;
@@ -166,28 +163,6 @@
}
}
#idFrameC .ui-tabs .ui-tabs-nav,
#idFrameE .ui-tabs .ui-tabs-nav {
background-color: transparent;
top: 0px;
left: 10px;
right: 10px;
margin-top: 21px;
border-top: 1px solid $workzoneTabBorderTop;
border-radius: 0;
height: 43px;
border-bottom: 1px solid $workzoneTabBorderBottom;
}
#idFrameC .ui-tabs .ui-tabs-panel,
#idFrameE .ui-tabs .ui-tabs-panel {
position: absolute;
top: 56px;
left: 0px;
bottom: 0px;
right: 0px;
}
.alert_datas_changed a {
color: #404040;
text-decoration: underline;

14
resources/www/prod/styles/_ie8.scss
View File

@@ -8,4 +8,18 @@
{
width:580px;
}
.btn-image {
width: 16px;
height: 16px;
// border: 1px solid #FF0000;
}
#idFrameC {
.ui-tabs {
.ui-tabs-nav {
li {
margin-top: -20px;
}
}
}
}
}

5
resources/www/prod/styles/main.scss
View File

@@ -100,4 +100,7 @@
.ui-tabs-vertical .ui-tabs-nav li { clear: left; width: 100%; border-bottom-width: 1px !important; border-right-width: 0 !important; margin: 0 -1px .2em 0; }
.ui-tabs-vertical .ui-tabs-nav li a { display:block; }
.ui-tabs-vertical .ui-tabs-nav li.ui-tabs-active { padding-bottom: 0; padding-right: .1em; border-right-width: 1px; border-right-width: 1px; }
.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right;}
.ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right;}
@import 'ie7';
@import 'ie8';