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

fix tooltip in record editor

Browse Source 
fix images path in record editor
wip: standardize font-sizes
This commit is contained in:
Florian BLOUET
2015-11-27 13:24:36 +01:00
parent 4e7131f296
commit 34689daaa8
37 changed files with 209 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/www/_shared/styles/_main-menu.scss
View File

@@ -42,7 +42,7 @@ $mainMenuBottomBorder: none !default;
display: inline-block; display: inline-block;
color: $mainMenuLinkColor; color: $mainMenuLinkColor;
> span { > span {
font-size: 12px; font-size: $xmediumFontSize;
font-weight: normal; font-weight: normal;
border-top: 3px solid transparent; border-top: 3px solid transparent;
display: block; display: block;

7
resources/www/_shared/styles/_variables.scss
View File

@@ -8,3 +8,10 @@ $mainMenuLineHeight: 36px;
$baseBorderRadius: 3px; $baseBorderRadius: 3px;
$borderRadiusLarge: 4px; $borderRadiusLarge: 4px;
$borderRadiusSmall: 2px; $borderRadiusSmall: 2px;
$defaultFontFamily: Helvetica, Arial, sans-serif;
$xsmallFontSize: 8px;
$smallFontSize: 10px;
$xmediumFontSize: 12px;
$mediumFontSize: 13px;

7
resources/www/_shared/styles/jquery-ui/_shared.scss
View File

@@ -339,7 +339,7 @@ button.ui-button::-moz-focus-inner {
text-align: center; text-align: center;
} }
.ui-datepicker .ui-datepicker-title select { .ui-datepicker .ui-datepicker-title select {
font-size: 1em; //font-size: 1em;
margin: 1px 0; margin: 1px 0;
} }
.ui-datepicker select.ui-datepicker-month-year { .ui-datepicker select.ui-datepicker-month-year {
@@ -351,7 +351,7 @@ button.ui-button::-moz-focus-inner {
} }
.ui-datepicker table { .ui-datepicker table {
width: 100%; width: 100%;
font-size: .9em; //font-size: .9em;
border-collapse: collapse; border-collapse: collapse;
margin: 0 0 .4em; margin: 0 0 .4em;
} }
@@ -780,6 +780,7 @@ body .ui-tooltip {
/* Component containers /* Component containers
----------------------------------*/ ----------------------------------*/
/* let bootstrap handle font-size
.ui-widget { .ui-widget {
font-family: Verdana,Arial,sans-serif; font-family: Verdana,Arial,sans-serif;
font-size: 1.1em; font-size: 1.1em;
@@ -793,7 +794,7 @@ body .ui-tooltip {
.ui-widget button { .ui-widget button {
font-family: Verdana,Arial,sans-serif; font-family: Verdana,Arial,sans-serif;
font-size: 1em; font-size: 1em;
} }*/
/* positioning */ /* positioning */

26
resources/www/_shared/styles/main.scss
View File

@@ -1,12 +1,12 @@
@import 'variables'; @import 'variables';
/** skin/common/main.css */ /** skin/common/main.css */
body{ body {
margin:0; margin: 0;
padding:0; padding: 0;
font-family:Helvetica,Arial,sans-serif; font-family: $defaultFontFamily;
font-size:12px; font-size: $mediumFontSize;
overflow:hidden; overflow: hidden;
} }
@@ -23,13 +23,15 @@ img{
position:absolute; position:absolute;
z-index:32000; z-index:32000;
overflow:hidden; overflow:hidden;
} hr{
#tooltip hr{
margin: 8px 0; margin: 8px 0;
}
.popover {
max-width: none;
width: auto;
}
} }
.PNB .PNB
{ {
position:absolute; position:absolute;
@@ -56,10 +58,6 @@ input.checkbox{
display:none; display:none;
} }
#tooltip .popover {
max-width: none;
width: auto;
}
.ui-dialog-titlebar { .ui-dialog-titlebar {
min-height: 20px; min-height: 20px;

2
resources/www/admin/styles/main.scss
View File

@@ -20,6 +20,8 @@ body {
padding: 0; padding: 0;
background-color: #ffffff; background-color: #ffffff;
color: #333333; color: #333333;
font-family: $defaultFontFamily;
font-size: $mediumFontSize;
overflow-y: auto; overflow-y: auto;
} }
.clear { .clear {

0
resources/www/prod/skins/000000/images/ui-bg_gloss-wave_20_111111_500x100.png → resources/www/common/images/icons/ui-bg_gloss-wave_20_111111_500x100.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

13
resources/www/common/js/jquery.tooltip.js
View File

@@ -300,7 +300,8 @@
topOffset = 20, topOffset = 20,
leftOffset = 20; leftOffset = 20;
if( $eventTarget ) { console.log($eventTarget.length)
if( $eventTarget.length > 0 ) {
// change offsets: // change offsets:
topOffset = -8; topOffset = -8;
leftOffset = -8; leftOffset = -8;
@@ -318,7 +319,7 @@
var ratioImage = $(h).width() / $(h).height(); var ratioImage = $(h).width() / $(h).height();
//position de l'image //position de l'image
console.log('$eventTarget', $eventTarget)
if ($eventTarget.offset().left > (v.x - $eventTarget.offset().left - $eventTarget.width())) { if ($eventTarget.offset().left > (v.x - $eventTarget.offset().left - $eventTarget.width())) {
hor = 'gauche'; hor = 'gauche';
wiH = $eventTarget.offset().left; wiH = $eventTarget.offset().left;
@@ -493,6 +494,10 @@
// delete timeout and show helper // delete timeout and show helper
function show() { function show() {
tID = null; tID = null;
var isBrowsable = false;
if( $.tooltip.current !== null ) {
isBrowsable = settings($.tooltip.current).isBrowsable;
}
if ((!IE || !$.fn.bgiframe) && settings($.tooltip.current).fade) { if ((!IE || !$.fn.bgiframe) && settings($.tooltip.current).fade) {
if (helper.parent.is(":animated")) if (helper.parent.is(":animated"))
@@ -507,12 +512,12 @@
.unbind('mouseenter') .unbind('mouseenter')
.unbind('mouseleave') .unbind('mouseleave')
.mouseenter(function(){ .mouseenter(function(){
if (settings($.tooltip.current).isBrowsable) { if (isBrowsable) {
$.tooltip.currentHover = true; $.tooltip.currentHover = true;
} }
}) })
.mouseleave(function () { .mouseleave(function () {
if (settings($.tooltip.current).isBrowsable) { if (isBrowsable) {
// if tooltip has scrollable content or selectionnable text - should be closed on mouseleave: // if tooltip has scrollable content or selectionnable text - should be closed on mouseleave:
$.tooltip.currentHover = false; $.tooltip.currentHover = false;
helper.parent.hide(); helper.parent.hide();

33
resources/www/common/styles/main.scss
View File

@@ -20,40 +20,7 @@ $mainMenuLinkBackgroundHoverColor: transparent;
#mainContent { #mainContent {
margin-top: $mainMenuHeight; margin-top: $mainMenuHeight;
#page {
background-color: #414141;
}
} }
body {
color: #FFFFFF;
background-color: #212121;
font-family: Helvetica, Arial, sans-serif;
font-size: 14px;
overflow: auto;
min-height: 100%;
width: 100%;
}
h1 {
font-size: 26px;
font-weight: bold;
padding: 50px 0 20px;
}
#page {
width: 860px;
background-color: #414141;
padding: 0 20px;
margin: 0 auto;
height: 100%;
position: relative !important;
}
.preview .thumb_wrapper {
overflow: hidden;
}
.caption {
padding: 50px 0 20px;
}

3
resources/www/lightbox/styles/main.scss
View File

@@ -14,7 +14,8 @@ body {
background-color: #BFBFBF; background-color: #BFBFBF;
color: #212121; color: #212121;
/*font-size:11px;*/ /*font-size:11px;*/
font-family: Arial, Helvetica, sans-serif; font-family: $defaultFontFamily;
font-size: $mediumFontSize;
} }
#mainContent { #mainContent {

5
resources/www/oauth/main.scss
View File

@@ -1,10 +1,11 @@
/********* Default CSS Oauth pages *********/ /********* Default CSS Oauth pages *********/
/****************** Page *******************/ /****************** Page *******************/
@import '../_shared/styles/variables';
html, body { html, body {
background: #000000; background: #000000;
font-family: Verdana, sans-serif; font-family: $defaultFontFamily;
font-size: $mediumFontSize;
color: #FFFFFF; color: #FFFFFF;
} }

5
resources/www/prod/js/jquery.main-prod.js
View File

@@ -324,7 +324,7 @@ function checkFilters(save) {
search.dates.minbound = $('#ADVSRCH_DATE_ZONE input[name=date_min]', adv_box).val(); search.dates.minbound = $('#ADVSRCH_DATE_ZONE input[name=date_min]', adv_box).val();
search.dates.maxbound = $('#ADVSRCH_DATE_ZONE input[name=date_max]', adv_box).val(); search.dates.maxbound = $('#ADVSRCH_DATE_ZONE input[name=date_max]', adv_box).val();
search.dates.field = $('#ADVSRCH_DATE_ZONE select[name=date_field]', adv_box).val(); search.dates.field = $('#ADVSRCH_DATE_ZONE select[name=date_field]', adv_box).val();
console.log(search.dates.minbound, search.dates.maxbound, search.dates.field)
if ($.trim(search.dates.minbound) || $.trim(search.dates.maxbound)) { if ($.trim(search.dates.minbound) || $.trim(search.dates.maxbound)) {
danger = true; danger = true;
$('#ADVSRCH_DATE_ZONE', adv_box).addClass('danger'); $('#ADVSRCH_DATE_ZONE', adv_box).addClass('danger');
@@ -1008,8 +1008,11 @@ function HueToRgb(m1, m2, hue) {
$(document).ready(function () { $(document).ready(function () {
$('input[name=search_type]').bind('click', function () { $('input[name=search_type]').bind('click', function () {
console.log('search bind')
var $this = $(this); var $this = $(this);
var $record_types = $('#recordtype_sel'); var $record_types = $('#recordtype_sel');
console.log($this.hasClass('mode_type_reg'), $record_types)
if ($this.hasClass('mode_type_reg')) { if ($this.hasClass('mode_type_reg')) {
$record_types.css("visibility", "hidden"); // better than hide because does not change layout $record_types.css("visibility", "hidden"); // better than hide because does not change layout
$record_types.prop("selectedIndex", 0); $record_types.prop("selectedIndex", 0);

4
resources/www/prod/skins/000000/skin-000000.scss
View File

@@ -123,9 +123,9 @@ $tabsNavBg: #666666;
$tabsNavBgActive: $mediumBackgroundColor; $tabsNavBgActive: $mediumBackgroundColor;
$contentLoaderImg: 'loader-white.gif'; $contentLoaderImg: 'loader-white.gif';
$btnBackground: #EAEAEA; $btnBackground: #f2f2f2;
$btnBackgroundHighlight: #D6D6D6; $btnBackgroundHighlight: #D6D6D6;
$btnColor: #8e8e8e; $btnColor: #737373;
$btnTextShadow: 0 -1px 0 rgba(0,0,0,0); $btnTextShadow: 0 -1px 0 rgba(0,0,0,0);
$btnInverseBackground: #444444; $btnInverseBackground: #444444;

BIN
resources/www/prod/skins/959595/images/ui-bg_gloss-wave_20_111111_500x100.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

11
resources/www/prod/skins/959595/skin-959595.scss
View File

@@ -123,10 +123,17 @@ $tabsNavBg: #999999;
$tabsNavBgActive: #B2B2B2; //#D9D9D9; $tabsNavBgActive: #B2B2B2; //#D9D9D9;
$contentLoaderImg: 'loader-black.gif'; $contentLoaderImg: 'loader-black.gif';
$btnBackground: #444444; //#B9B9B9; /*$btnBackground: #444444; //#B9B9B9;
$btnBackgroundHighlight: #393939; $btnBackgroundHighlight: #393939;
$btnColor: #AAAAAA; $btnColor: #AAAAAA;
$btnTextShadow: 0 -1px 0 rgba(0,0,0,.25); $btnTextShadow: 0 -1px 0 rgba(0,0,0,.25);*/
$btnBackground: #f2f2f2;
$btnBackgroundHighlight: #D6D6D6;
$btnColor: #737373;
$btnTextShadow: 0 -1px 0 rgba(0,0,0,0);
$btnInverseBackground: #B9B9B9; $btnInverseBackground: #B9B9B9;
$btnInverseBackgroundHighlight: #A4A4A4; $btnInverseBackgroundHighlight: #A4A4A4;

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

@@ -18,7 +18,7 @@ $basketsColor: #076882;
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
border-radius: 0; border-radius: 0;
width: 3px; width: 3px;
background-color: $scrollBgColor; background-color: lighten($scrollBgColor, 5);
} }
::-webkit-scrollbar-button { ::-webkit-scrollbar-button {
@@ -51,10 +51,11 @@ legend {
border: none; border: none;
} }
body { body {
color: $darkerTextColor; color: $darkerTextColor;
background-color: $darkerBackgroundColor; background-color: $darkerBackgroundColor;
font-family: $defaultFontFamily;
font-size: $mediumFontSize;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@@ -71,11 +72,9 @@ html {
margin: 0; margin: 0;
padding: 0; padding: 0;
z-index: 1; z-index: 1;
} body {
html, body {
font-size: 12px;
z-index: 1; z-index: 1;
}
} }
a { a {
@@ -180,7 +179,7 @@ div#PREVIEWTITLEWRAPPER {
cursor: pointer; cursor: pointer;
color: rgb(204, 204, 204); color: rgb(204, 204, 204);
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: $mediumFontSize;
text-align: right; text-align: right;
text-decoration: underline; text-decoration: underline;
height: 16px; height: 16px;
@@ -253,13 +252,13 @@ span.ww_winTitle {
.cont_infos div { .cont_infos div {
line-height: 20px; line-height: 20px;
font-size: 10px; font-size: $smallFontSize;
font-weight: bold; font-weight: bold;
} }
.cont_infos span { .cont_infos span {
cursor: pointer; cursor: pointer;
font-size: 10px; font-size: $smallFontSize;
} }
#SPANTITLE img { #SPANTITLE img {
@@ -426,7 +425,7 @@ H4 {
border-width: 1px; border-width: 1px;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.2) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
font-size: 12px; font-size: $xmediumFontSize;
font-weight: bold; font-weight: bold;
line-height: 14px; line-height: 14px;
text-align: center; text-align: center;
@@ -505,6 +504,14 @@ H4 {
margin: 3px 1px 3px 1px; margin: 3px 1px 3px 1px;
} }
.close {
color: $textPrimaryColor;
// box-shadow: inset 1px 1px 2px 0px rgba($darkerBackgroundColor,0.7);
&:hover {
color: $textPrimaryColor;
}
}
.status-marker { .status-marker {
line-height: 10px; line-height: 10px;
border-radius: 50%; border-radius: 50%;

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

@@ -125,7 +125,7 @@
.contextMenuTrigger { .contextMenuTrigger {
color: $textPrimaryColor; color: $textPrimaryColor;
font-size: 10px; font-size: $smallFontSize;
margin-left: 5px; margin-left: 5px;
line-height: 18px; line-height: 18px;
vertical-align: middle; vertical-align: middle;

6
resources/www/prod/skins/ui-components/_answers-tools.scss
View File

@@ -15,7 +15,7 @@
margin-bottom: 0px; margin-bottom: 0px;
margin-top: 0px; margin-top: 0px;
background-color: $mediumBackgroundColor; background-color: $mediumBackgroundColor;
font-size:10px; font-size: $smallFontSize;
z-index:100; z-index:100;
height:45px; height:45px;
} }
@@ -38,7 +38,7 @@
#idFrameT .tools .dropdownButton button.btn { #idFrameT .tools .dropdownButton button.btn {
height: 30px; height: 30px;
font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif; font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px; font-size: $mediumFontSize;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-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); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
@@ -84,7 +84,7 @@
#idFrameT .tools .dropdown-menu a { #idFrameT .tools .dropdown-menu a {
padding: 3px 10px; padding: 3px 10px;
font-size: 12px; font-size: $mediumFontSize;
color: $answersToolsBtnColor; color: $answersToolsBtnColor;
cursor: pointer; cursor: pointer;
} }

16
resources/www/prod/skins/ui-components/_answers.scss
View File

@@ -154,18 +154,6 @@ $answersInfoLabelColor: #949494 !default;
position: relative; position: relative;
clear: left; clear: left;
margin: 10px; margin: 10px;
.btn {
font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px;
font-weight: bold;
}
.btn-inverse:hover {
color: $textPrimaryHoverColor;
}
.btn-group.open .btn-inverse.dropdown-toggle {
background-color: $darkerBackgroundColor;
background-image: none;
}
.headblock { .headblock {
max-width: 800px; max-width: 800px;
margin-bottom: 20px; margin-bottom: 20px;
@@ -215,7 +203,7 @@ $answersInfoLabelColor: #949494 !default;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
.author { .author {
font-size: 12px; font-size: $mediumFontSize;
font-weight: normal; font-weight: normal;
margin-left: 15px; margin-left: 15px;
} }
@@ -247,7 +235,7 @@ $answersInfoLabelColor: #949494 !default;
height: 60px; height: 60px;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: $mediumFontSize;
background-position: center bottom; background-position: center bottom;
} }
.contents { .contents {

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

@@ -15,7 +15,7 @@
.ui-dialog .btn { .ui-dialog .btn {
font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif; font-family: verdana,"Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 12px; font-size: $mediumFontSize;
font-weight: bold; font-weight: bold;
} }

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

@@ -50,7 +50,8 @@ $diapoBorderColor: $darkerBorderColor !default;
.bottom { .bottom {
position: absolute; position: absolute;
bottom: 0px; bottom: 0;
z-index: 100;
} }
div.title { div.title {

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

@@ -32,7 +32,7 @@ $modalBackground: $darkerBackgroundColor !default;
overflow: hidden; overflow: hidden;
a { a {
padding: 5px 8px; padding: 5px 8px;
font-size: 0.8em; //font-size: 0.8em;
font-weight: normal; font-weight: normal;
color: $lightTextColor; // more contrasted color color: $lightTextColor; // more contrasted color
} }
@@ -84,7 +84,7 @@ $modalBackground: $darkerBackgroundColor !default;
.ui-tabs li.ui-state-active a, .ui-state-active a:link, .ui-state-active a { .ui-tabs li.ui-state-active a, .ui-state-active a:link, .ui-state-active a {
color: $mediumTextActiveColor; color: $mediumTextActiveColor;
font-weight: bold; font-weight: bold;
font-size: 0.8em; //font-size: 0.8em;
} }
.ui-state-active, .ui-widget-content .ui-state-active { .ui-state-active, .ui-widget-content .ui-state-active {

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

@@ -9,7 +9,6 @@
*border: 1px solid $bridgeDropdownMenuBorder; *border: 1px solid $bridgeDropdownMenuBorder;
a { a {
padding: 3px 10px; padding: 3px 10px;
font-size: 12px;
color: $bridgeDropdownMenuColor; color: $bridgeDropdownMenuColor;
cursor: pointer; cursor: pointer;
&:hover { &:hover {
@@ -196,7 +195,7 @@
#dialog_publicator .element_menu .default_action, #dialog_publicator .element_menu .default_action,
.element_menu .trigger { .element_menu .trigger {
z-index: 444; z-index: 444;
font-size: 13px; font-size: $mediumFontSize;
font-weight: normal; font-weight: normal;
border-color: #666 border-color: #666
} }

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

@@ -294,7 +294,8 @@
#idFrameE { #idFrameE {
.ui-datepicker-inline { .ui-datepicker-inline {
background-color: #111111; background-color: #111111;
background-image: url('#{$skinsImagesPath}ui-bg_gloss-wave_20_111111_500x100.png'); // /assets/prod/skins/{{cssfile}}/images/
background-image: url('#{$iconsPath}ui-bg_gloss-wave_20_111111_500x100.png');
background-repeat: repeat-x; background-repeat: repeat-x;
background-position: 50% top; background-position: 50% top;
} }

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

@@ -76,7 +76,7 @@
#PREVIEWOTHERSINNER li.title { #PREVIEWOTHERSINNER li.title {
font-weight: bold; font-weight: bold;
font-size: 13px; font-size: $mediumFontSize;
margin: 10px 10px 5px; margin: 10px 10px 5px;
} }

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

@@ -14,7 +14,7 @@
background-color: $darkerBackgroundColor; background-color: $darkerBackgroundColor;
border: 1px solid $darkerBorderColor; border: 1px solid $darkerBorderColor;
color: $darkerTextColor; color: $darkerTextColor;
font-size: 13px; font-size: $mediumFontSize;
cursor: pointer; cursor: pointer;
&.odd { &.odd {
background-color: lighten($darkerBackgroundColor, 5); background-color: lighten($darkerBackgroundColor, 5);

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

@@ -12,11 +12,11 @@
} }
.PushBox .LeftColumn ul { .PushBox .LeftColumn ul {
margin:10px 0; margin: 10px 0;
} }
.PushBox .LeftColumn ul li img { .PushBox .LeftColumn ul li img {
margin-right:5px; margin-right: 5px;
vertical-align: middle; vertical-align: middle;
} }
@@ -43,90 +43,90 @@
} }
.PushBox .user_content .badges { .PushBox .user_content .badges {
top:50px; top: 50px;
overflow:auto; overflow: auto;
height:auto; height: auto;
bottom:50px; bottom: 50px;
left:20px; left: 20px;
right:20px; right: 20px;
} }
.PushBox .user_content .badges .badge .deleter { .PushBox .user_content .badges .badge .deleter {
float:right; float: right;
} }
.PushBox .user_content .badges .badge { .PushBox .user_content .badges .badge {
width:230px; width: 230px;
height:80px; height: 80px;
margin:10px; margin: 10px;
display:inline-block; display: inline-block;
background-color: #515150; background-color: #515150;
border:3px solid #515150; border: 3px solid #515150;
padding:3px; padding: 3px;
} }
.PushBox .user_content .badges .badge.selected { .PushBox .user_content .badges .badge.selected {
border:3px solid #EFEFEF; border: 3px solid #EFEFEF;
} }
.PushBox .user_content .badges .badge .toggles .status_on .toggle_off { .PushBox .user_content .badges .badge .toggles .status_on .toggle_off {
display:none; display: none;
} }
.PushBox .user_content .badges .badge .toggles .status_off .toggle_on { .PushBox .user_content .badges .badge .toggles .status_off .toggle_on {
display:none; display: none;
} }
.PushBox .user_content .badges .badge td{ .PushBox .user_content .badges .badge td {
vertical-align: top; vertical-align: top;
} }
.PushBox .user_content .badges .badge td.toggle{ .PushBox .user_content .badges .badge td.toggle {
vertical-align: bottom; vertical-align: bottom;
} }
.PushBox .user_content .badges .badge .icon{ .PushBox .user_content .badges .badge .icon {
width:80px; width: 80px;
background-color:#404040; background-color: #404040;
} }
.PushBox .user_content .badges .badge .infos { .PushBox .user_content .badges .badge .infos {
padding-top:3px; padding-top: 3px;
padding-left:5px; padding-left: 5px;
} }
.PushBox .user_content .badges .badge table { .PushBox .user_content .badges .badge table {
width:95%; width: 95%;
} }
.PushBox .user_content .badges .badge .infos table { .PushBox .user_content .badges .badge .infos table {
height:75px; height: 75px;
} }
.PushBox .user_content .badges .badge .infos tr { .PushBox .user_content .badges .badge .infos tr {
height:20px; height: 20px;
} }
.PushBox .user_content .badges .badge .infos tr.toggles { .PushBox .user_content .badges .badge .infos tr.toggles {
height:25px; height: 25px;
text-align:center; text-align: center;
} }
.PushBox .user_content .badges .badge .icon img { .PushBox .user_content .badges .badge .icon img {
margin:7px; margin: 7px;
} }
.PushBox .user_content .badges .badge .name { .PushBox .user_content .badges .badge .name {
font-weight:bold; font-weight: bold;
white-space:pre-line; white-space: pre-line;
display:block; display: block;
font-size:12px; font-size: $mediumFontSize;
} }
.PushBox .user_content .badges .badge .subtite { .PushBox .user_content .badges .badge .subtite {
display:block; display: block;
font-size:10px; font-size: 10px;
} }
.PushBox .user_content .header .options { .PushBox .user_content .header .options {
@@ -134,7 +134,7 @@
} }
.PushBox .all-lists .lists { .PushBox .all-lists .lists {
overflow:auto; overflow: auto;
} }
.PushBox .LeftColumn .content ul.list li:nth-child(odd) { .PushBox .LeftColumn .content ul.list li:nth-child(odd) {
@@ -162,19 +162,19 @@
} }
.PushBox .lists .list { .PushBox .lists .list {
padding:3px 0; padding: 3px 0;
} }
.PushBox .welcome { .PushBox .welcome {
text-align: center; text-align: center;
font-size: 16px; font-size: 16px;
line-height: 18px; line-height: 18px;
margin : 20px 0; margin: 20px 0;
} }
.PushBox .welcome h1 { .PushBox .welcome h1 {
font-weight: bold; font-weight: bold;
margin:40px 0; margin: 40px 0;
} }
#list-editor-search-results { #list-editor-search-results {
@@ -182,14 +182,14 @@
} }
#list-editor-search-results table td { #list-editor-search-results table td {
padding:1px 0; padding: 1px 0;
overflow:hidden; overflow: hidden;
} }
#list-editor-search-results table tr { #list-editor-search-results table tr {
line-height: 24px; line-height: 24px;
vertical-align: middle; vertical-align: middle;
cursor:pointer; cursor: pointer;
} }
#list-editor-search-results table tr.odd { #list-editor-search-results table tr.odd {
@@ -197,70 +197,66 @@
} }
#list-editor-search-results table tr.selected { #list-editor-search-results table tr.selected {
background-color:#D18827; background-color: #D18827;
} }
#list-editor-search-results table th.sortable span { #list-editor-search-results table th.sortable span {
margin:0 5px; margin: 0 5px;
} }
#list-editor-search-results table th.sortable { #list-editor-search-results table th.sortable {
cursor:pointer; cursor: pointer;
} }
#list-editor-search-results table th.sortable.hover, #list-editor-search-results table th.sortable.hover,
#list-editor-search-results table th.sortable.sorted { #list-editor-search-results table th.sortable.sorted {
background-color:#F0AD30; background-color: #F0AD30;
} }
#list-editor-search-results table th.sortable span.ord_notifier { #list-editor-search-results table th.sortable span.ord_notifier {
display:none; display: none;
} }
#list-editor-search-results table th.sortable.sorted span.ord_notifier { #list-editor-search-results table th.sortable.sorted span.ord_notifier {
display:inline; display: inline;
} }
#ListShare table { #ListShare table {
width:100%; width: 100%;
margin:5px; margin: 5px;
background-color:#505050; background-color: #505050;
} }
#ListManager .content.readonly .badge { #ListManager .content.readonly .badge {
width:250px; width: 250px;
display:inline-block; display: inline-block;
margin:5px; margin: 5px;
background-color: #515150; background-color: #515150;
padding:5px; padding: 5px;
} }
#ListManager .content.readonly .badge .deleter { #ListManager .content.readonly .badge .deleter {
float:right; float: right;
} }
#ListManager .content.readonly .badge table {
#ListManager .content.readonly .badge table{ width: auto;
width:auto;
table-layout: fixed; table-layout: fixed;
} }
#ListManager .content.readonly .badge .infos{ #ListManager .content.readonly .badge .infos {
padding:2px; padding: 2px;
} }
#ListManager h1 span.title{ #ListManager h1 span.title {
font-size:24px; font-size: 24px;
line-height:24px; line-height: 24px;
font-weight:bold; font-weight: bold;
vertical-align:middle; vertical-align: middle;
} }
#PushBox .general_togglers li { #PushBox .general_togglers li {
margin-top:5px; margin-top: 5px;
} }
#PushBox .general_togglers button { #PushBox .general_togglers button {
@@ -269,12 +265,10 @@
width: 100%; width: 100%;
} }
#PushBox .general_togglers button .ui-button-text { #PushBox .general_togglers button .ui-button-text {
font-weight: lighter; font-weight: lighter;
} }
#PushBox .content .list_saver { #PushBox .content .list_saver {
padding-top: 20px; padding-top: 20px;
padding-bottom: 20px; padding-bottom: 20px;
@@ -298,15 +292,15 @@
} }
#ListManager .content .lists span.action { #ListManager .content .lists span.action {
display:block; display: block;
text-align:center; text-align: center;
font-weight: bold; font-weight: bold;
width:100%; width: 100%;
} }
#recommanded-users { #recommanded-users {
margin-top:25px; margin-top: 25px;
line-height:15px; line-height: 15px;
} }
#recommanded-users a:last-child { #recommanded-users a:last-child {
@@ -315,8 +309,8 @@
} }
#QuickAddUser table { #QuickAddUser table {
width:100%; width: 100%;
table-layout:auto; table-layout: auto;
} }
#QuickAddUser table tr td { #QuickAddUser table tr td {

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

@@ -8,7 +8,7 @@
margin: 0 4px; margin: 0 4px;
background-color: #0077BC; background-color: #0077BC;
border-radius: $defaultBorderRadius; border-radius: $defaultBorderRadius;
font-size: 12px; font-size: $mediumFontSize;
line-height: 14px; line-height: 14px;
font-weight: bold; font-weight: bold;
cursor: pointer; cursor: pointer;

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

@@ -22,7 +22,7 @@
h5 { h5 {
margin-top: 20px; margin-top: 20px;
margin-bottom: 10px; margin-bottom: 10px;
font-size: 13px; font-size: $mediumFontSize;
font-weight: bold; font-weight: bold;
text-align: left; text-align: left;
} }

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

@@ -35,7 +35,7 @@
color: $workzoneBasketAlertDataColor; color: $workzoneBasketAlertDataColor;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
font-size: 12px; font-size: $mediumFontSize;
display: none; display: none;
z-index: 5000; z-index: 5000;
} }
@@ -79,7 +79,7 @@
right: 40px; right: 40px;
height: 16px; height: 16px;
margin: 2px 0; margin: 2px 0;
font-size: 12px; font-size: $mediumFontSize;
} }
.menu { .menu {
text-align: right; text-align: right;
@@ -119,7 +119,7 @@
} }
.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {
color: $textPrimaryActiveColor; color: $textPrimaryActiveColor;
font-size: 1em; //font-size: 1em;
} }
} }
} }

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

@@ -14,7 +14,7 @@
} }
li { li {
line-height: 17px; line-height: 17px;
font-size: 13px; font-size: $mediumFontSize;
} }
&.fancytree-container { &.fancytree-container {
background-color: $mediumBackgroundColor; background-color: $mediumBackgroundColor;
@@ -50,7 +50,7 @@
border-left: 4px solid $mediumBackgroundColor; border-left: 4px solid $mediumBackgroundColor;
border-bottom: 1px solid $mediumBorderColor; border-bottom: 1px solid $mediumBorderColor;
.fancytree-title { .fancytree-title {
font-size: 12px; font-size: $xmediumFontSize;
margin-left: 10px; margin-left: 10px;
} }
&:hover { &:hover {
@@ -93,7 +93,7 @@
} }
.fancytree-title { .fancytree-title {
font-size: 12px; font-size: $xmediumFontSize;
color: $proposalsTitle; color: $proposalsTitle;
background-color: transparent; background-color: transparent;
border: 0px none transparent; border: 0px none transparent;

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

@@ -54,7 +54,7 @@
} }
#THPD_T_treeBox { #THPD_T_treeBox {
font-size: 0.85em; font-size: $xmediumFontSize;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
> div { > div {

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

@@ -155,7 +155,7 @@
display: inline; display: inline;
margin: 0 15px 0 0; margin: 0 15px 0 0;
float: left; float: left;
font-size: 11px; font-size: $smallFontSize;
color: $workzoneToolsLabelColor; color: $workzoneToolsLabelColor;
line-height: 22px; line-height: 22px;
vertical-align: middle; vertical-align: middle;

6
resources/www/setup/styles/main.scss
View File

@@ -1,8 +1,8 @@
$iconsPath: '../../../assets/common/images/icons/'; $iconsPath: '../../../assets/common/images/icons/';
@import '../../_shared/styles/variables';
body, html { body, html {
font-family: Helvetica, Verdana, Arial, sans-serif; font-family: $defaultFontFamily;
font-size: 13px; font-size: $mediumFontSize;
color: white; color: white;
background-color: #000000; background-color: #000000;
} }

56
templates/web/overview.html.twig
View File

@@ -8,40 +8,36 @@
{% block stylesheet %} {% block stylesheet %}
<style type="text/css"> <style type="text/css">
html{ body {
color: #FFFFFF;
color:white; background-color: #212121;
background-color:#212121; font-family: Helvetica, Arial, sans-serif;
font-size: 14px;
overflow: auto;
min-height: 100%;
width: 100%;
} }
h1 {
font-size: 26px;
font-weight: bold;
padding: 50px 0 20px;
}
#page {
width: 860px;
background-color: #414141;
padding: 0 20px;
margin: 0 auto;
height: 100%;
position: relative !important;
}
body{ .preview .thumb_wrapper {
font-family:Helvetica, Arial, sans-serif; overflow: hidden;
font-size:14px;
overflow:auto;
min-height:100%;
width:100%;
top:0;
left:0;
position:absolute;
} }
h1{
font-size:26px; .caption {
font-weight:bold; padding: 50px 0 20px;
padding:50px 0 20px;
}
#page{
width:860px;
background-color:#414141;
padding:0 20px;
margin:0 auto;
height:100%;
}
.preview .thumb_wrapper{
overflow:hidden;
}
.caption{
padding:50px 0 20px;
} }
</style> </style>
{% endblock %} {% endblock %}

2
templates/web/prod/actions/edit_default.html.twig
View File

@@ -78,7 +78,7 @@
{% set i = field.get_id() %} {% set i = field.get_id() %}
{% if field.is_readonly() is empty %} {% if field.is_readonly() is empty %}
<div class="edit_field" id="EditFieldBox_{{i}}" onclick="return(edit_mdwn_fld(event, {{i}}, '{{field.get_name()}}'));" > <div class="edit_field" id="EditFieldBox_{{i}}" onclick="return(edit_mdwn_fld(event, {{i}}, '{{field.get_name()}}'));" >
<img id="editSGtri_{{i}}" style="visibility:hidden;" src="/assets/prod/images/{{cssfile}}/images/suggested.gif" /> <img id="editSGtri_{{i}}" style="visibility:hidden;" src="/assets/prod/skins/{{cssfile}}/images/suggested.gif" />
<img src="/assets/common/images/icons/info.gif" tooltipsrc="{{ path('prod_tooltip_metadata', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" class="fieldTips" alt=""/> <img src="/assets/common/images/icons/info.gif" tooltipsrc="{{ path('prod_tooltip_metadata', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" class="fieldTips" alt=""/>
{% if field.get_dces_element %} {% if field.get_dces_element %}
<img src="/assets/common/images/icons/dublincore.png" tooltipsrc="{{ path('prod_tooltip_dces', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" alt="{{ 'Ce champ est decrit comme un element DublinCore' | trans }}" class="DCESTips" /> <img src="/assets/common/images/icons/dublincore.png" tooltipsrc="{{ path('prod_tooltip_dces', { 'sbas_id' : field.get_databox().get_sbas_id(), 'field_id' : field.get_id() }) }}" alt="{{ 'Ce champ est decrit comme un element DublinCore' | trans }}" class="DCESTips" />

2
templates/web/prod/results/record.html.twig
View File

@@ -69,7 +69,7 @@
<td style='text-align:right;width:{{l_width}}px;' valign='bottom'> <td style='text-align:right;width:{{l_width}}px;' valign='bottom'>
<a style="float:right;padding:0;cursor:pointer;" class="contextMenuTrigger" id="contextTrigger_{{record.id}}"> <a style="float:right;padding:0;cursor:pointer;" class="contextMenuTrigger" id="contextTrigger_{{record.id}}">
<img src="/assets/common/images/icons/contextMenuTrigger.png" height="10" /> <img src="/assets/common/images/icons/contextMenuTrigger.png" height="10" />
&#9660; <i class="icon-caret-down"></i>
</a> </a>
<table cellspacing="0" cellpadding="0" style="display:none;" id="answerContext_{{record.id}}" class="contextMenu answercontextmenu"> <table cellspacing="0" cellpadding="0" style="display:none;" id="answerContext_{{record.id}}" class="contextMenu answercontextmenu">
<tbody> <tbody>

2
templates/web/prod/templates/upload.html.twig
View File

@@ -35,7 +35,7 @@
</div> </div>
<p class="error alert-error"></p> <p class="error alert-error"></p>
<p class="success alert-success"></p> <p class="success alert-success"></p>
<button type="button" class="remove-element btn btn-inverse btn-mini"><%= language.cancel %></button> <button type="button" class="remove-element btn btn-mini"><%= language.cancel %></button>
</div> </div>
</div> </div>
</li> </li>