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

Commit

Permalink
Merge branch 'dashboard' of github.com:zanata/zanata-server into dash…
Browse files Browse the repository at this point in the history 
…board
  • Loading branch information
Alex Eng committed Jul 29, 2013
2 parents e02ff42 + 0a983c8 commit 80d30b4
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 56 deletions.
6 changes: 3 additions & 3 deletions zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
View file
Expand Up @@ -12,7 +12,7 @@
}

.ignore_action {
background-color: white;
background-color: #a2b4c3;
text-align: center;
width: 100px;
display: block
Expand All @@ -26,14 +26,14 @@
}

.approved_action {
background-color: #099B09;
background-color: #70a98b;
text-align: center;
width: 100px;
display: block
}

.reject_action {
background-color: red;
background-color: #e3824e;
text-align: center;
width: 100px;
display: block
Expand Down
38 changes: 17 additions & 21 deletions zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
View file
Expand Up @@ -8,12 +8,11 @@
<ui:style field="style"
type="org.zanata.webtrans.client.ui.TooltipPopupPanel.Styles">
.transUnitCountTooltip {
background-color: #FBFBFB;
background-color: #fff;
text-align: center;
border-radius: 10px;
border: 2px solid #818181;
padding: 2px;
z-index: 100;
box-shadow: 0 1px 2px rgba($black, 0.2);
}

.table {
Expand All @@ -23,47 +22,48 @@

.table td {
width: 75px;
border-radius: 2px;
font-weight: 600;
}

.topHeader {
border: none;
color: #4F4F4F;
white-space: nowrap;
padding: 2px;
font-weight: 700;
}

.translated-header {
border: none;
color: #002D00;
color: #70a98b;
white-space: nowrap;
padding: 2px;
}

.rejected-header {
border: none;
color: darkred;
color: #e3824e;
white-space: nowrap;
padding: 2px;
}

.approved-header {
border: none;
color: #00008b;
color: #4e9fdd;
white-space: nowrap;
padding: 2px;
}

.draft-header {
border: none;
color: #7D3E00;
color: #e0c350;
white-space: nowrap;
padding: 2px;
}

.untranslated-header {
border: none;
color: #6D6D6D;
color: #a2b4c3;
white-space: nowrap;
padding: 2px;
}
Expand All @@ -76,32 +76,28 @@
}

.total {
border: 1px solid #6D6D6D;
border: none;
color: #4F4F4F;
}

.translated {
background: #099B09;
border: 1px solid #006900;
color: #002D00;
background: #70a98b;
color: #fff;
}

.approved {
background: lightblue;
border: 1px solid #0000ff;
color: #0000CD;
background: #4e9fdd;
color: #fff;
}

.draft {
background: #e0c350;
border: 1px solid #CD8E00;
color: #7D3E00;
color: #fff;
}

.untranslated {
background: #E5E5E5;
border: 1px solid #B3B3B3;
color: #6D6D6D;
background: #a2b4c3;
color: #fff;
}

</ui:style>
Expand Down
2 changes: 1 addition & 1 deletion zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
View file
Expand Up @@ -9,7 +9,7 @@
}

.approved {
background: #0000CD;
background: #4e9fdd;
z-index: 0;
}

Expand Down
18 changes: 9 additions & 9 deletions zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
View file
Expand Up @@ -3,7 +3,7 @@
xmlns:g="urn:import:com.google.gwt.user.client.ui">

<ui:with field="messages" type="org.zanata.webtrans.client.resources.TableEditorMessages" />

<ui:style
type="org.zanata.webtrans.client.ui.ValidationMessagePanelView.Styles">
.container {
Expand All @@ -22,7 +22,7 @@

.label {
font-size: 11px;
color:#D14836;
color: #e0575b;
}

.header {
Expand All @@ -31,23 +31,23 @@
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
background:#D14836;
background: #e0575b;
}

.header tr:hover
{
background:#D14836;
background: #e0575b;
color:#FFFFFF;
text-decoration:underline;
}

.content {
color: #D14836;
color: #e0575b;
}

</ui:style>



<g:DisclosurePanel addStyleNames="{style.container}" animationEnabled="true" ui:field="disclosurePanel">
<g:customHeader>
Expand All @@ -68,4 +68,4 @@



</ui:UiBinder>
</ui:UiBinder>
16 changes: 8 additions & 8 deletions zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
View file
Expand Up @@ -4,30 +4,30 @@
<ui:style type="org.zanata.webtrans.client.view.GlossaryView.Styles">
.headerLabel {
padding-right:5px;
padding-top:5px;
padding-top:5px;
font-weight:bold;
color:#C35817;
color: #416988;
}

.rootContainer {
min-width:400px;
width:100%;
}

.searchBox
{
border:1px solid #A7A7A7;
border-radius:3px;
padding:2px;
}

.topBar
{
padding-left:10px;
}

</ui:style>

<g:ScrollPanel>
<g:VerticalPanel styleName="{style.rootContainer}">
<g:cell height="30px" verticalAlignment="ALIGN_MIDDLE">
Expand All @@ -46,4 +46,4 @@
</g:cell>
</g:VerticalPanel>
</g:ScrollPanel>
</ui:UiBinder>
</ui:UiBinder>
16 changes: 8 additions & 8 deletions zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
View file
Expand Up @@ -10,38 +10,38 @@
border-radius: 8px;
padding: 20px;
}

.keyShortcutHeading {
font-size: 1.4em;
}

.keyShortcutCategoryTitle {
font-size: 1.2em;
padding:4px 0;
}

.keyShortcutTable
{
padding-bottom:5px;
font-size: 1.2em;
}

.keyShortcutTable td
{
color:#FFA07A;
color: #ccc;
background:black;
padding: 2px 10px;
padding: 2px 10px 2px 0;
border-width: 0px;
border-bottom-width: 1px;
border-color: #301a1a;
border-color: #444;
}
</ui:style>

<g:VerticalPanel styleName="{style.keyShortcutPanel}">
<g:cell horizontalAlignment="ALIGN_CENTER">
<g:Label ui:field="heading" styleName="{style.keyShortcutHeading}"/>
</g:cell>

<g:cell>
<g:FlowPanel ui:field="shortcutContainer"/>
</g:cell>
Expand Down
6 changes: 3 additions & 3 deletions zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
View file
Expand Up @@ -8,7 +8,7 @@
padding-right: 5px;
padding-top: 5px;
font-weight: bold;
color: #C35817;
color: #416988;
}

.searchBox {
Expand All @@ -33,8 +33,8 @@
}

.approved {
border-left: 2px solid #0000CD;
border-right: 2px solid #0000CD;
border-left: 2px solid #4e9fdd;
border-right: 2px solid #4e9fdd;
}

</ui:style>
Expand Down
6 changes: 3 additions & 3 deletions zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
View file
Expand Up @@ -129,8 +129,8 @@ is visible outside of the scrolling box. */
visibility: visible;
}

/*div.CodeMirror-selected { background: #d9d9d9; }
.CodeMirror-focused div.CodeMirror-selected { background: #d7d4f0; }*/
div.CodeMirror-selected { background: #dcecf7; }
.CodeMirror-focused div.CodeMirror-selected { background: #cce2f5; }

.CodeMirror-searching {
background: #ffa;
Expand All @@ -152,7 +152,7 @@ is visible outside of the scrolling box. */
.cm-s-default span.cm-string {color: #a11;}
.cm-s-default span.cm-string-2 {color: #f50;}
.cm-s-default span.cm-meta {color: #555;}
.cm-s-default span.cm-error {color: #f00;}
.cm-s-default span.cm-error {color: #e0575b;}
.cm-s-default span.cm-qualifier {color: #555;}
.cm-s-default span.cm-builtin {color: #30a;}
.cm-s-default span.cm-bracket {color: #cc7;}
Expand Down

0 comments on commit 80d30b4

Please sign in to comment.