Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
A bunch of css (interna; gwt) changes to fix the editor UI.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukebrooker
lukebrooker committed Jul 25, 2013
1 parent e884845 commit 8180b76
Show file tree
Hide file tree
Showing 11 changed files with 86 additions and 2,427 deletions.
4 changes: 2 additions & 2 deletions zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
View file
Expand Up @@ -19,7 +19,7 @@
}

.downgrade_action {
background-color: #FFC000;
background-color: #e0c350;
text-align: center;
width: 100px;
display: block;
Expand Down Expand Up @@ -135,4 +135,4 @@
</g:customCell>
</g:row>
</g:Grid>
</ui:UiBinder>
</ui:UiBinder>
4 changes: 2 additions & 2 deletions zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
View file
Expand Up @@ -93,7 +93,7 @@
}

.draft {
background: #FFC000;
background: #e0c350;
border: 1px solid #CD8E00;
color: #7D3E00;
}
Expand Down Expand Up @@ -139,4 +139,4 @@

</g:Grid>
</g:HTMLPanel>
</ui:UiBinder>
</ui:UiBinder>
6 changes: 3 additions & 3 deletions zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
View file
Expand Up @@ -14,7 +14,7 @@
}

.draft {
background: #ffc000;
background: #e0c350;
z-index: 0;
}

Expand All @@ -24,7 +24,7 @@
}

.translated {
background: #099b09;
background: #70a98b;
z-index: 0;
}

Expand Down Expand Up @@ -60,4 +60,4 @@
<g:Label ui:field='label' styleName='{style.label}'/>
</g:layer>
</g:LayoutPanel>
</ui:UiBinder>
</ui:UiBinder>
22 changes: 11 additions & 11 deletions zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
View file
Expand Up @@ -30,21 +30,21 @@
font-size: smaller;
color: #ffffff;
z-index: 1;
background-color: #ff4500;
background-color: #416988;
}

.commentIndicator {
position: absolute;
right: 5px;
font-size: smaller;
color: #ffffff;
right: 3px;
top: 2px;
font-size: 12px;
color: #fff;
z-index: 1;
background-color: #ff0000;
border-radius: 10px;
border: thick double #ffffff;
padding-left: 2px;
padding-right: 2px;
box-shadow: 2px 2px 2px #888;
font-weight: 600;
background-color: #a2b4c3;
border-radius: 2px;
border: none;
padding: 2px 6px;
cursor: pointer;
}

Expand All @@ -63,4 +63,4 @@
<fui:EditorButtonsWidget ui:field="buttons" />
</g:cell>
</g:HorizontalPanel>
</ui:UiBinder>
</ui:UiBinder>
74 changes: 37 additions & 37 deletions zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
View file
Expand Up @@ -5,60 +5,60 @@
<ui:style type="org.zanata.webtrans.client.view.TransFilterView.Styles">
.container {
}

.container ul {
display:inline-block;
margin:0;
padding:0;
padding:0;
}

.container > ul > li {
display:inline-block;
}

.transFilterTextBoxEmpty {
color: grey;
font-style: italic;
}

.translated {
border-left:3px solid #099B09;
border-left:3px solid #70a98b;
}

.fuzzy {
border-left:3px solid #FFC000;
border-left:3px solid #e0c350;
}

.untranslated {
border-left:3px solid #4e4e4e;
border-left:3px solid #a2b4c3;
}

.approved {
border-left:3px solid lightblue;
border-left:3px solid #4e9fdd;
}

.rejected {
border-left:3px solid #FF4500;
border-left:3px solid #e3824e;
}

.hasError {
border-left:3px solid #FF4500;
border-left:3px solid #e0575b;
padding-right:5px;
opacity:0.6;
transition: .3s;
display:inline !important;
}

.filterListToggle {
font-size:16px;
cursor:pointer;
padding: 7px 3px 7px 0;
}

.drop-down:hover .filterListToggle {
color:#0085cc;
}

.container ul.filterList {
display:none;
min-width: 100%;
Expand All @@ -69,24 +69,24 @@
background-color: #fafafa;
box-shadow: 0 1px 1px rgba(0,0,0,0.2), inset 0 1px 1px rgba(0,0,0,0.2);
}

.container ul.filterList li {
display:inherit;
}

.drop-down {
position:relative;
}

.drop-down:hover {
background-color: #fff;
box-shadow: 0 1px 1px rgba(0,0,0,0.2);
}

.drop-down:hover .filterList {
display: block;
}

.drop-down label,
.drop-down input[type=checkbox],
.filterList li label,
Expand All @@ -95,55 +95,55 @@
display: inline-block;
vertical-align: middle;
}

.drop-down label,
.filterList li label {
line-height: 32px;
}

.drop-down input[type=checkbox] {
margin: 0 3px 0 6px;
margin: 0 3px 0 6px;
}

.filterList li span {
display: block;
opacity: 0.6;
transition: .3s;
-webkit-transition: .3s;
-moz-transition: .3s;
}

.filterList li span:hover, .hasError:hover {
background-color: #fff;
opacity: 1;
}

.filterList li input[type=checkbox] {
margin: 0;
padding:0;
top:8px;
left:4px;
position:absolute;
}

.filterList li label {
padding: 0 6px 0 20px;
display: block;
}

.checkbox {
position:relative;
display:inline-block;
}
}

</ui:style>

<g:HTMLPanel styleName="{style.container}">
<ul>
<li>
<fui:SearchField ui:field="searchField"/>
</li>

<li class="{style.drop-down}">
<g:CheckBox ui:field="parentIncompleteChk" styleName="{style.checkbox}"><ui:msg>Incomplete</ui:msg></g:CheckBox>
<span class="icon-down-open {style.filterListToggle}"/>
Expand All @@ -154,12 +154,12 @@
<li>
<g:CheckBox ui:field="fuzzyChk" styleName="{style.fuzzy} {style.checkbox}"><ui:msg>Fuzzy</ui:msg></g:CheckBox>
</li>
<li>
<li>
<g:CheckBox ui:field="rejectedChk" styleName="{style.rejected} {style.checkbox}"><ui:msg>Rejected</ui:msg></g:CheckBox>
</li>
</ul>
</li>

<li class="{style.drop-down}">
<g:CheckBox ui:field="parentCompleteChk" styleName="{style.checkbox}"><ui:msg>Complete</ui:msg></g:CheckBox>
<span class="icon-down-open {style.filterListToggle}"/>
Expand All @@ -172,10 +172,10 @@
</li>
</ul>
</li>
<li class="{style.drop-down}">

<li class="{style.drop-down}">
<g:CheckBox ui:field="hasErrorChk" styleName="{style.hasError} {style.checkbox}"><ui:msg>Has warning</ui:msg></g:CheckBox>
</li>
</ul>
</g:HTMLPanel>
</ui:UiBinder>
</ui:UiBinder>
10 changes: 5 additions & 5 deletions zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
View file
Expand Up @@ -26,12 +26,12 @@
padding-left: 10px;
min-height: 30px;
}

.translated {
border-left: 2px solid #099b09;
border-right: 2px solid #099b09;
border-left: 2px solid #70a98b;
border-right: 2px solid #70a98b;
}

.approved {
border-left: 2px solid #0000CD;
border-right: 2px solid #0000CD;
Expand Down Expand Up @@ -61,4 +61,4 @@
</g:cell>
</g:VerticalPanel>
</g:ScrollPanel>
</ui:UiBinder>
</ui:UiBinder>
22 changes: 11 additions & 11 deletions zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
View file
Expand Up @@ -2,34 +2,34 @@
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui">
<ui:style type="org.zanata.webtrans.client.view.TransUnitNavigationView.Styles">

.navButton {
cursor:pointer;
font-size:18px;
color:#4E4E4E;
}

.navButton:hover {
color:#0085CC;
color:#4e9fdd;
}

.fuzzyUntranslated {
color:#A67D00;
color:#a2b4c3;
}

.fuzzy {
color:#FFC000;
color:#e0c350;
}

.untranslated {
color:#4E4E4E;
color:#a2b4c3;
}

</ui:style>
<g:FlowPanel>
<g:InlineLabel ui:field="firstEntry" addStyleNames="{style.navButton} icon-to-start"/>
<g:InlineLabel ui:field="prevState" addStyleNames="{style.navButton} icon-left-open"/>
<g:InlineLabel ui:field="nextState" addStyleNames="{style.navButton} icon-right-open-1"/>
<g:InlineLabel ui:field="lastEntry" addStyleNames="{style.navButton} icon-to-end"/>
</g:FlowPanel>
</ui:UiBinder>
</ui:UiBinder>

0 comments on commit 8180b76

Please sign in to comment.