PHRAS-845 - fix close button

PHRAS-846 - fix admin log view PHRAS-843 - fix action icons added white skin misc fix on skin color handling replace image icons by fonts icons
2025-10-23 18:03:17 +00:00 · 2015-12-01 18:48:38 +01:00
parent 696d7401d4
commit ebaf36f2d2
46 changed files with 672 additions and 401 deletions
--- a/resources/www/prod/skins/ui-components/_actions.scss
+++ b/resources/www/prod/skins/ui-components/_actions.scss
@@ -98,6 +98,7 @@
  background-repeat: no-repeat;
 }
 */
+/*
 .contextMenuTrigger {
  color: $textPrimaryColor;
  font-size: $smallFontSize;
@@ -109,3 +110,4 @@
 .contextMenuTrigger:hover {
  color: $textPrimaryColor;
 }
+*/
--- a/resources/www/prod/skins/ui-components/_answers-tools.scss
+++ b/resources/www/prod/skins/ui-components/_answers-tools.scss
@@ -3,117 +3,105 @@
 #idFrameT {
  margin-left: -20px;
  margin-right: -20px;
+  #selectCase {
+    background: url('#{$iconsPath}ccoch0.gif') no-repeat center center;
+    padding-left: 16px;
+  }
+  .btn-toolbar {
+    margin-bottom: 0px;
+    margin-top: 0px;
+    background-color: $mediumBackgroundColor;
+    font-size: $smallFontSize;
+    z-index:100;
+    height:45px;
+    box-sizing: border-box;
+    border-bottom: none; //1px solid $darkerBorderColor;
+  }
+  .tools {
+    &:first-child .btn-group {
+      border-right: 1px solid $answersToolsBtnSeparatorBorder;
+    }
+    .btn-group {
+      float: left;
+    }
+    .classicButton button.btn,
+    .dropdownButton {
+      margin: 0;
+    }
+    .classicButton button.btn,
+    .dropdownButton button.btn {
+      height: 30px;
+      font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
+      font-size: $mediumFontSize;
+      -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+      -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+    }
+    .classicButton button.btn-inverse,
+    .dropdownButton button.btn-inverse {
+      background-image: none;
+      background-color: $mediumBackgroundColor;
+      color: $answersToolsBtnColor;
+      border-radius: 0;
+      margin: 0;
+      height: 45px;
+      border: 0;
+    }
+    .classicButton button.btn-inverse {
+      border-right: 0;
+    }
+    .dropdownButton button.btn-inverse {
+      border-left: 0;
+      border-right: 0;
+    }
+    .classicButton button.btn-inverse:hover,
+    .dropdownButton button.btn-inverse:hover {
+      background-color: $answersToolsBtnBg;
+      *background-color: $answersToolsBtnBg;
+      color: $textPrimaryHoverColor;
+    }
+
+    .classicButton button.btn-inverse img,
+    .dropdownButton button.btn-inverse img {
+      margin: 0 2px;
+      max-width: none;
+    }
+    .dropdown-menu {
+      min-width: 95px;
+      background-color: $answersToolsBtnBg;
+      *border: 1px solid $answersToolsBtnBorder;
+      a {
+        padding: 3px 10px;
+        font-size: $mediumFontSize;
+        color: $answersToolsBtnColor;
+        cursor: pointer;
+        &:hover {
+          background-color: $answersToolsBtnHoverBg;
+          color: $highlightTextColor; //$answersToolsBtnHoverColor;
+        }
+      }
+      img {
+        margin-right: 5px;
+      }
+    }
+    #settings {
+      display: block;
+      float: right;
+      line-height: 45px;
+      padding-right: 51px;
+      padding-left: 21px;
+      margin-right: 0;
+      color: $answersToolsBtnSettingsColor;
+      background: url('#{$iconsPath}icone_settings.png') right 15px no-repeat;
+      background-position: right 21px top 15px;
+      border-left: 1px solid $answersToolsBtnSettingsBorder;
+      &:hover {
+        background-color: $answersToolsBtnSettingsHoverBg;
+      }
+    }
+  }
 }

-
-#idFrameT #selectCase {
-  background: url('#{$iconsPath}ccoch0.gif') no-repeat center center;
-  padding-left: 16px;
-}
-
-#idFrameT .btn-toolbar {
-  margin-bottom: 0px;
-  margin-top: 0px;
-  background-color: $mediumBackgroundColor;
-  font-size: $smallFontSize;
-  z-index:100;
-  height:45px;
-}
-
-
-#idFrameT .tools .classicButton button.btn,
-#idFrameT .tools .dropdownButton {
-  margin: 0;
-}
-
-#idFrameT .tools:first-child .btn-group {
-  border-right: 1px solid $answersToolsBtnSeparatorBorder;
-}
-
-#idFrameT .tools .btn-group {
-  float: left;
-}
-
-#idFrameT .tools .classicButton button.btn,
-#idFrameT .tools .dropdownButton button.btn {
-  height: 30px;
-  font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
-  font-size: $mediumFontSize;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-#idFrameT .tools .classicButton button.btn-inverse,
-#idFrameT .tools .dropdownButton button.btn-inverse {
-  background-image: none;
-  background-color: $mediumBackgroundColor;
-  border-radius: 0;
-  margin: 0;
-  height: 45px;
-  border: 0;
-}
-
-#idFrameT .tools .classicButton button.btn-inverse {
-  border-right: 0;
-}
-
-#idFrameT .tools .dropdownButton button.btn-inverse {
-  border-left: 0;
-  border-right: 0;
-}
-
-#idFrameT .tools .classicButton button.btn-inverse:hover,
-#idFrameT .tools .dropdownButton button.btn-inverse:hover {
-  background-color: $answersToolsBtnBg;
-  *background-color: $answersToolsBtnBg;
-  color: $textPrimaryHoverColor;
-}
-
-#idFrameT .tools .classicButton button.btn-inverse img,
-#idFrameT .tools .dropdownButton button.btn-inverse img {
-  margin: 0 2px;
-  max-width: none;
-}
-
-#idFrameT .tools .dropdown-menu {
-  min-width: 95px;
-  background-color: $answersToolsBtnBg;
-  *border: 1px solid $answersToolsBtnBorder;
-}
-
-#idFrameT .tools .dropdown-menu a {
-  padding: 3px 10px;
-  font-size: $mediumFontSize;
-  color: $answersToolsBtnColor;
-  cursor: pointer;
-}
-
-#idFrameT .tools .dropdown-menu a:hover {
-  background-color: $answersToolsBtnHoverBg;
-  color: $highlightTextColor; //$answersToolsBtnHoverColor;
-}
-
-#idFrameT .tools .dropdown-menu img {
-  margin-right: 5px;
-}
-
-#idFrameT .tools #settings {
-  display: block;
-  float: right;
-  line-height: 45px;
-  padding-right: 51px;
-  padding-left: 21px;
-  margin-right: 0;
-  color: $answersToolsBtnSettingsColor;
-  background: url('#{$iconsPath}icone_settings.png') right 15px no-repeat;
-  background-position: right 21px top 15px;
-  border-left: 1px solid $answersToolsBtnSettingsBorder;
-}
-
-#idFrameT .tools #settings:hover {
-  background-color: $answersToolsBtnSettingsHoverBg;
-}
@media screen and (max-width: 1200px) {
  #idFrameT .tools button.btn-inverse img {
    display: none;
@@ -124,5 +112,6 @@
    padding-left: 0px;
    margin-right: 8px;
    width: 26px;
+    background-position: right 1px top 15px;
  }
 }
--- a/resources/www/prod/skins/ui-components/_answers.scss
+++ b/resources/www/prod/skins/ui-components/_answers.scss
@@ -11,8 +11,9 @@ $answersInfoLabelColor: #949494 !default;
  margin: 0;
 }

-.captionRolloverTips, .previewTips, .infoTips,
-.baskAdder, .printer, .downloader, .baskDeleter {
+// .captionRolloverTips, .previewTips, .infoTips,
+/*
+.baskAdder {
  background-image: url('#{$iconsPath}zoom.gif');
  background-repeat: no-repeat;
  background-position: center center;
@@ -33,18 +34,9 @@ $answersInfoLabelColor: #949494 !default;
 .baskAdder {
  background-image: url('#{$iconsPath}basket.gif');
 }
+*/

-.baskDeleter {
-  background-image: url('#{$iconsPath}delete.gif');
-}

-.printer {
-  background-image: url('#{$iconsPath}print.gif');
-}
-
-.downloader {
-  background-image: url('#{$iconsPath}download.gif');
-}
 #answers {
  .status {
    img {
@@ -74,7 +66,6 @@ $answersInfoLabelColor: #949494 !default;
 #idFrameT {
  #answers {
    background-color: $darkerBackgroundColor;
-    border: 1px solid $darkerBorderColor;
    top: 55px;
    bottom: 0;
    margin-right: 8px;
--- a/resources/www/prod/skins/ui-components/_diapo.scss
+++ b/resources/www/prod/skins/ui-components/_diapo.scss
@@ -52,11 +52,35 @@ $diapoBorderColor: $darkerBorderColor !default;
    position: absolute;
    bottom: 0;
    z-index: 100;
+    &.actions {
+      /*.action-icon {
+        cursor: pointer;
+        font-size: 12px;
+
+      }*/
+      .icon-stack {
+        font-size: 11px;
+        cursor: pointer;
+        width: 19px;
+        height: 15px;
+        line-height: 12px;
+        //padding: 0;
+        //margin: 0;
+      }
+      .icon-stack-base {
+        color: #777777; //darken($darkerBackgroundColor, 10);
+      }
+      .icon-light {
+        color: $darkerBackgroundColor; //$darkerTextColor;
+      }
+    }
  }

-  div.title {
+  .title {
    overflow: hidden;
    text-overflow: ellipsis;
+    line-height: 14px;
+    font-size: $mediumFontSize;
  }

  .duration {
--- a/resources/www/prod/skins/ui-components/_jquery-ui.scss
+++ b/resources/www/prod/skins/ui-components/_jquery-ui.scss
@@ -1,6 +1,14 @@
 $modalBorder: 1px solid $darkerBorderColor !default;
 $modalBackground: $darkerBackgroundColor !default;

+$tabContentBackgroundColor: $mediumBackgroundColor !default;
+$tabBackgroundColor: lighten($lightBackgroundColor, 5) !default;
+$tabTextColor: $mediumTextColor !default;
+$tabActiveBackgroundColor: $tabContentBackgroundColor !default;
+$tabActiveTextColor: $lightTextColor !default;
+$tabDisabledBackgroundColor: $tabBackgroundColor !default;
+$tabDisabledTextColor: $mediumTextActiveColor !default;
+
 .ui-dialog .ui-dialog-content.loading, .loading {
  background-image: url('#{$iconsPath}#{$contentLoaderImg}');
  background-position: center center;
@@ -26,7 +34,7 @@ $modalBackground: $darkerBackgroundColor !default;
 .ui-tabs {
  .ui-tabs-nav {
    li {
-      background-color: lighten($lightBackgroundColor, 5); //$tabsNavBg;
+      background-color: $tabBackgroundColor;
      height: 30px;
      border: none;
      overflow: hidden;
@@ -37,13 +45,14 @@ $modalBackground: $darkerBackgroundColor !default;
        font-weight: normal;
        color: $mediumTextColor; // more contrasted  color
      }
+      &.ui-tabs-active a,
      &.ui-tabs-active {
        font-size: $mediumFontSize;
-        color: $lightTextColor;
-        background-color: $mediumBackgroundColor; //$tabsNavBgActive;
+        color: $tabActiveTextColor;
+        background-color: $tabActiveBackgroundColor; //$tabsNavBgActive;
        border: none;
      }
-      &.ui-tabs-active a,
+
      &.ui-state-disabled a,
      &.ui-state-processing a {
        cursor: pointer;
@@ -58,7 +67,7 @@ $modalBackground: $darkerBackgroundColor !default;
    display: block;
    border-width: 0;
    padding: 0px;
-    background-color: $mediumBackgroundColor;
+    background-color: $tabContentBackgroundColor;
    &.tabBox {
      height: 405px;
      overflow: auto;
@@ -77,7 +86,7 @@ $modalBackground: $darkerBackgroundColor !default;

 .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
  cursor: pointer;
-  color: $mediumTextColor; //$workzoneColor2;
+  color: $tabTextColor; //$workzoneColor2;
 }

 .ui-state-default, .ui-widget-content .ui-state-default {
@@ -85,7 +94,7 @@ $modalBackground: $darkerBackgroundColor !default;
 }

 .ui-tabs li.ui-state-active a, .ui-state-active a:link, .ui-state-active a {
-  color: $mediumTextActiveColor;
+  color: $tabActiveTextColor;
  font-weight: bold;
  //font-size: 0.8em;
 }
--- a/resources/www/prod/skins/ui-components/_main-menu.scss
+++ b/resources/www/prod/skins/ui-components/_main-menu.scss
@@ -1,12 +0,0 @@
-@import '../../../_shared/styles/variables';
-$mainMenuBottomBorder: none;
-
-$mainMenuBackgroundColor: $mediumBackgroundColor; //BFBFBF;
-$mainMenuBottomBorder: none;
-$mainMenuMarginBottom: 0;
-
-$mainMenuLinkColor: $mainMenuLinkColor;
-$mainMenuLinkBackgroundHoverColor: transparent; //$bgInverseHoverColor;
-$mainMenuLinkHoverColor: $textPrimaryHoverColor;
-
-@import '../../../_shared/styles/main-menu';
--- a/resources/www/prod/skins/ui-components/_modal-edit.scss
+++ b/resources/www/prod/skins/ui-components/_modal-edit.scss
@@ -129,6 +129,20 @@
    padding: 2px;
    margin-right: 10px;
    position: relative;
+
+    .icon-stack {
+      font-size: 11px;
+      cursor: pointer;
+      width: 19px;
+      height: 15px;
+      line-height: 14px;
+      .icon-stack-base {
+        color: #777777; //darken($darkerBackgroundColor, 10);
+      }
+      .icon-light {
+        color: $darkerBackgroundColor; //$darkerTextColor;
+      }
+    }
  }
  div.edit_field.odd {
    background-color: $darkBackgroundColor;
@@ -468,7 +482,7 @@ div.thesaurus {
      left: 10px;
      right: 10px;
      margin-top: 21px;
-      border-top: 1px solid $workzoneTabBorderTop;
+      border-top: 1px solid $workzoneTabTopBorder;
      border-radius: 0;
      height: 43px;
      border-bottom: 1px solid $workzoneTabBorderBottom;
--- a/resources/www/prod/skins/ui-components/_pagination.scss
+++ b/resources/www/prod/skins/ui-components/_pagination.scss
@@ -1,3 +1,4 @@
+$paginationLinkColor: $linkDefaultColor !default;

 #tool_navigate input {
  text-align: center;
@@ -12,6 +13,7 @@
  line-height: 14px;
  font-weight: bold;
  cursor: pointer;
+  color: $paginationLinkColor
 }


@@ -84,7 +86,7 @@
  font-weight: normal;
  text-shadow: none;
  box-shadow: none;
-  color: $paginateBorderColor;
+  color: $paginationLinkColor;
 }

 #paginate #tool_navigate:first-child {
--- a/resources/www/prod/skins/ui-components/_workzone-baskets.scss
+++ b/resources/www/prod/skins/ui-components/_workzone-baskets.scss
@@ -1,15 +1,17 @@

 #idFrameC {
  #baskets {
+    top: $tabHeight !important;
+    border-top: 1px solid $darkBorderColor;
    > div {
-      border-top: 1px solid $mediumBorderColor;
+      // border-top: 1px solid $mediumBorderColor;
    }
    .bloc {
      position: absolute;
-      top: 31px;
-      left: 0pt;
+      top: 0;
+      left: 0;
      right: 1px;
-      bottom: 0px;
+      bottom: 0;
      overflow-y: auto;
      overflow-x: hidden;
      &.groupDrop {
--- a/resources/www/prod/skins/ui-components/_workzone-proposals.scss
+++ b/resources/www/prod/skins/ui-components/_workzone-proposals.scss
@@ -1,10 +1,15 @@
+$proposalsTitleColor: $darkerTextColor !default;
+$proposalsTitleHoverColor: $darkerTextHoverColor !default;
+$proposalsContentTextColor: $darkerTextColor !default;
+$proposalsContentTextColor: $darkerTextColor !default;
 /******* PROPOSALS ************************************************************/

+
 #proposals {
  position: relative;
  left: 5px;
  border-top: 1px solid $darkBorderColor;
-  top: 87px !important;
+  top: $tabHeight !important;
  *:focus {
    outline: none;
  }
@@ -44,6 +49,8 @@
  }
  .fancytree-folder {
    font-weight: bold;
+    font-size: $xmediumFontSize;
+    color: $proposalsTitleColor;
    height: 49px;
    line-height: 49px;
    margin-left: 0;
@@ -80,6 +87,7 @@
    }
  }

+
  .fancytree-expander {
    position: absolute;
    right: 10px;
@@ -94,11 +102,19 @@

  .fancytree-title {
    font-size: $xmediumFontSize;
-    color: $proposalsTitle;
+    color: $proposalsTitleColor;
    background-color: transparent;
    border: 0px none transparent;
  }

+  .fancytree-node {
+    font-size: $xmediumFontSize;
+    color: $proposalsContentTextColor;
+    //background-color: transparent;
+    //border: 0px none transparent;
+    cursor: pointer;
+  }
+
  .facetFilter {
    font-weight: normal;
    position: absolute;
--- a/resources/www/prod/skins/ui-components/_workzone-thesaurus.scss
+++ b/resources/www/prod/skins/ui-components/_workzone-thesaurus.scss
@@ -1,4 +1,4 @@
-
+$thesaurusTabHeight: $subTabHeight !default;
 .treeview {

  li {
@@ -82,7 +82,8 @@ dans l'onglet thesaurus : arbres, menus contextuels
 ===================================== */
 .ui-tabs {
  #thesaurus_tab {
-    top: 87px !important;
+    top: $tabHeight !important;
+    border-top: 1px solid $darkBorderColor;

  }
 }
@@ -95,14 +96,16 @@ dans l'onglet thesaurus : arbres, menus contextuels
        color: $textPrimaryColor;
      }
      &.th_tab {
-        height: 43px;
+        height: $thesaurusTabHeight; // in order to display bottom border
        margin: 0;
+        border-bottom: 1px solid transparent;
+        box-sizing: border-box;
        .ui-state-active {
          border-bottom: 1px solid $thesaurusColor;
        }
        a {
-          height: 43px;
-          line-height: 43px;
+          height: $thesaurusTabHeight;
+          line-height: $thesaurusTabHeight;
          vertical-align: middle;
          margin: 0;
          padding: 0 20px;
@@ -200,7 +203,8 @@ dans l'onglet thesaurus : arbres, menus contextuels
        vertical-align: middle;
        padding: 0;
        border-radius: 0;
-        background: $mediumBackgroundColor url('#{$iconsPath}icon_magnify.png') 50% no-repeat;
+        background-color: $mediumBackgroundColor;
+        color: $mediumTextColor;
        border: none;
        margin: 0;
        outline: none;
--- a/resources/www/prod/skins/ui-components/_workzone.scss
+++ b/resources/www/prod/skins/ui-components/_workzone.scss
@@ -1,3 +1,23 @@
+$workzoneBackgroundColor: $darkBackgroundColor !default; //$mediumBackgroundColor !default;
+$workzoneTopBorder: none !default;
+$workzoneTabTopBorder: 1px solid $darkBorderColor !default;
+$workzoneBorderTopColor: $mediumBorderColor !default;
+$tabHeight: 86px !default;
+$subTabHeight: 46px !default;
+
+
+$workzoneTabContentBackgroundColor: $workzoneBackgroundColor !default;
+
+$workzoneTabBackgroundColor: $workzoneBackgroundColor !default;
+$workzoneTabTextColor: $mediumTextColor !default;
+
+$workzoneTabActiveBackgroundColor: $tabContentBackgroundColor !default;
+$workzoneTabActiveTextColor: $lightTextColor !default;
+
+$workzoneTabDisabledBackgroundColor: $tabBackgroundColor !default;
+$workzoneTabDisabledTextColor: $mediumTextActiveColor !default;
+
+
 /**
 * Workzone
 */
@@ -7,9 +27,6 @@
  bottom: 0 !important;
  &.closed {
    min-width: 0;
-    #retractableButton {
-      background: url('#{$iconsPath}workzoneEscamote_on.png') 30px 30px no-repeat;
-    }
  }
  #retractableButton {
    cursor: pointer;
@@ -17,14 +34,17 @@
    height: 85px;
    float: right;
    text-align: center;
-    line-height: 70px;
+    line-height: 85px;
    margin-bottom: -20px;
-    background: url('#{$iconsPath}workzoneEscamote.png') 30px 36px no-repeat;
+    i {
+      font-size: 23px;
+      color: $mediumTextColor;
+    }
  }
  .wrapper {
-    background-color: $mediumBackgroundColor;
+    background-color: $workzoneBackgroundColor;
    right: 10px;
-    border-top: 1px solid $mediumBorderColor; //$workzoneBorderTop;
+    border-top: $workzoneTopBorder; //$workzoneBorderTop;
  }

  .ui-tabs {
@@ -36,23 +56,25 @@
    margin: 0;
    padding: 0;
    .ui-tabs-nav {
-      background-color: transparent;
+      background-color: $workzoneTabContentBackgroundColor;
      top: 0;
      left: 10px;
      right: 10px;
      //margin-top: 21px;
-      border-top: 1px solid $workzoneTabBorderTop;
+      // border-top: 1px solid $workzoneTabTopBorder;
      border-radius: 0;
-      height: 43px;
+      height: $subTabHeight;
      border-bottom: 1px solid $workzoneTabBorderBottom;
+      box-sizing: border-box;
      li {
        width: auto;
-        height: 85px;
+        height: $tabHeight;
        display: inline-block;
-        background-color: $mediumBackgroundColor;
+        background-color: $workzoneTabBackgroundColor;
        z-index: 10;
        border-radius: 0;
        margin: 0;
+        box-sizing: border-box;
        &.proposals_WZ {
          &.ui-state-active {
            a {
@@ -96,7 +118,7 @@
          a {
            background-color: $workzoneTabBgActive;
            border-bottom: 1px solid $thesaurusColor;
-            height: 82px;
+            // height: 82px;
          }
        }
      }