980px layout

This commit is contained in:
Olivier Mayer
2015-02-24 18:18:31 +09:00
parent a49acb03e4
commit e028b4c7d5
8 changed files with 31 additions and 23 deletions

View File

@@ -152,7 +152,7 @@ class Query implements ControllerProviderInterface
$explain .= '<br><div>' . $result->getDuration() . ' s</div>dans index ' . $result->getIndexes(); $explain .= '<br><div>' . $result->getDuration() . ' s</div>dans index ' . $result->getIndexes();
$explain .= "</div>"; $explain .= "</div>";
$infoResult = '<a href="#" class="infoDialog" infos="' . str_replace('"', '&quot;', $explain) . '">' .$app->trans('%total% reponses', ['%total%' => '<span>'.$result->getTotal().'</span>']) . '</a>' . $app->trans('%number% documents<br/>selectionnes', ['%number%' => '<span id="nbrecsel"></span>']); $infoResult = '<a href="#" class="infoDialog" infos="' . str_replace('"', '&quot;', $explain) . '">' .$app->trans('%total% reponses', ['%total%' => '<span>'.$result->getTotal().'</span>']) . '</a>';
$json['infos'] = $infoResult; $json['infos'] = $infoResult;
$json['navigation'] = $string; $json['navigation'] = $string;

View File

@@ -172,7 +172,7 @@
</a> </a>
</li> </li>
</ul> </ul>
<div id="baskets" class="PNB" style="top:52px;"> <div id="baskets" class="PNB">
{% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %} {% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %}
{{WorkZoneMacros.make_bloc(app, WorkZone)}} {{WorkZoneMacros.make_bloc(app, WorkZone)}}
</div> </div>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 947 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@@ -109,7 +109,7 @@ body {
} }
.PNB .ui-corner-top { .PNB .ui-corner-top {
top: 73px; top: 100px;
} }
@@ -235,7 +235,7 @@ span.ww_winTitle {
#idFrameC .ui-tabs .ui-tabs-nav li { #idFrameC .ui-tabs .ui-tabs-nav li {
width: auto; width: auto;
height: 81px; height: 73px;
display: inline-block; display: inline-block;
background-color: #3b3b3b; background-color: #3b3b3b;
z-index: 10; z-index: 10;
@@ -273,7 +273,7 @@ span.ww_winTitle {
} }
#idFrameC .ui-tabs .ui-tabs-nav li.ui-state-active a { #idFrameC .ui-tabs .ui-tabs-nav li.ui-state-active a {
background-color: #666666; background-color: #333;
border-bottom: 3px solid #076882; border-bottom: 3px solid #076882;
} }
@@ -285,22 +285,22 @@ span.ww_winTitle {
display: block; display: block;
background-image: url("/skins/icons/workzone32.png"); background-image: url("/skins/icons/workzone32.png");
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 18px 18px; background-position: 9px 16px;
width: 91px; width: 70px;
height: 78px; height: 70px;
} }
#idFrameC .icon-menu .WZtabs { #idFrameC .icon-menu .WZtabs {
display: block; display: block;
width: 91px; width: 70px;
height: 78px; height: 70px;
line-height: 78px; line-height: 70px;
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
} }
#basket_menu_trigger { #basket_menu_trigger {
padding: 34px 9px 0 0; padding: 27px 7px 0 0;
float: right; float: right;
font-size: 9px; font-size: 9px;
cursor: pointer; cursor: pointer;
@@ -522,17 +522,23 @@ span.ww_winTitle {
/******* FORMULAIRE DE RECHERCHE **********************************************/ /******* FORMULAIRE DE RECHERCHE **********************************************/
.searchFormWrapper { .searchFormWrapper {
margin: 25px 0 0 45px; margin: 25px 0 0 5px;
line-height: 30px; line-height: 30px;
} }
#searchForm {
width: 80%;
float: left;
}
#searchForm .input-append { #searchForm .input-append {
float: left; float: left;
width: 80%;
} }
#searchForm .control-group { #searchForm .control-group {
float: left; float: left;
margin-left: 30px; margin-left: 0;
} }
#searchForm .input-append .btn { #searchForm .input-append .btn {
@@ -541,10 +547,12 @@ span.ww_winTitle {
#searchForm .input-append a.btn { #searchForm .input-append a.btn {
height: 22px; height: 22px;
width: 5%;
} }
#searchForm .input-append button.btn { #searchForm .input-append button.btn {
height: 30px; height: 30px;
width: 15%;
} }
/******* PRESENTATION DE MINIATURES *******************************************/ /******* PRESENTATION DE MINIATURES *******************************************/
@@ -624,7 +632,7 @@ div.diapo {
} }
#answers_status{ #answers_status{
width: 200px; width: auto;
float: right; float: right;
} }
@@ -917,7 +925,7 @@ div.diapo {
#idFrameC .ui-tabs .ui-tabs-panel,#idFrameE .ui-tabs .ui-tabs-panel { #idFrameC .ui-tabs .ui-tabs-panel,#idFrameE .ui-tabs .ui-tabs-panel {
position: absolute; position: absolute;
top: 31px; top: 44px;
left: 0px; left: 0px;
bottom: 0px; bottom: 0px;
right: 0px; right: 0px;
@@ -1106,7 +1114,7 @@ form.phrasea_query input.query {
padding-left: 30px; padding-left: 30px;
font-size: 16px; font-size: 16px;
margin: 0; margin: 0;
width: 370px; width: 80%;
} }
#basket-rename-box .btn, #reorder_box .btn { #basket-rename-box .btn, #reorder_box .btn {
@@ -1657,12 +1665,12 @@ input.btn-mini {
.gui_vsplitter,.ui-resizable-e { .gui_vsplitter,.ui-resizable-e {
top: 50%; top: 50%;
width: 10px; width: 13px;
padding: 35px 0; padding: 0 0;
height: 0; height: 54px;
position: absolute; position: absolute;
/*background-image: url('../../icons/vsplitter.png');*/ background-image: url('../../icons/vsplitter.png');
background-color: #212121; background-color: #3b3b3b;
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
right: 0; right: 0;

View File

@@ -310,7 +310,7 @@ function resize() {
if ($('#idFrameC').data('ui-resizable')) { if ($('#idFrameC').data('ui-resizable')) {
$('#idFrameC').resizable('option', 'maxWidth', (bodySize.x - 670)); $('#idFrameC').resizable('option', 'maxWidth', (bodySize.x - 670));
$('#idFrameC').resizable('option', 'minWidth', 265); $('#idFrameC').resizable('option', 'minWidth', 305);
} }
answerSizer(); answerSizer();