<%= yield(:navigation) %>
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 8c8781b48f..ad93785d8c 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -27,7 +27,6 @@
<%#= overlay end %>
-
<%= yield(:navigation) %>
diff --git a/assets/javascripts/alchemy.js b/assets/javascripts/alchemy.js
index 5d598eb0ee..dcc629cbf3 100644
--- a/assets/javascripts/alchemy.js
+++ b/assets/javascripts/alchemy.js
@@ -88,13 +88,13 @@ if (typeof(Alchemy) === 'undefined') {
Alchemy.PreviewWindow = $iframe.dialog({
modal: false,
title: title,
- width: $(window).width() - 512,
- height: $(window).height() - 94,
+ width: $(window).width() - 504,
+ height: $(window).height() - 90,
minWidth: 600,
minHeight: 300,
show: "fade",
hide: "fade",
- position: [73, 84],
+ position: [70, 84],
autoResize: true,
closeOnEscape: false,
create: function() {
@@ -192,11 +192,11 @@ if (typeof(Alchemy) === 'undefined') {
modal: false,
minWidth: 422,
minHeight: 300,
- height: $(window).height() - 94,
+ height: $(window).height() - 90,
title: options.texts.title,
show: "fade",
hide: "fade",
- position: [$(window).width() - 432, 84],
+ position: [$(window).width() - 428, 84],
closeOnEscape: false,
create: function() {
$dialog.before(Alchemy.createElementWindowToolbar(options.toolbarButtons));
diff --git a/assets/stylesheets/alchemy.css b/assets/stylesheets/alchemy.css
index 701b33a72e..c988432319 100644
--- a/assets/stylesheets/alchemy.css
+++ b/assets/stylesheets/alchemy.css
@@ -1,6 +1,6 @@
-/* @override http://localhost:3000/stylesheets/alchemy/alchemy.css */
-
-/* @override http://localhost:3000/stylesheets/alchemy/alchemy.css */
+/* @override
+ http://localhost:3000/stylesheets/alchemy/alchemy.css
+*/
html {
height: 100%;
@@ -307,17 +307,6 @@ div#overlay_text_box img {
/* @group top_frame */
-#corner {
- z-index: 15;
- width: 65px;
- height: 16px;
- position: fixed;
- left: 0;
- top: 0;
- background: url(/images/alchemy/gui/shading.png) repeat-x 0 -2px;
- font-size: 0;
-}
-
#preview_frame {
background-color: white;
width: 100%;
@@ -336,21 +325,22 @@ div#top_menu {
#main_menu {
white-space: nowrap;
- z-index: 5;
+ z-index: 2;
height: 100%;
position: fixed;
top: 0;
left: 0;
width: 65px;
overflow: hidden;
+ border-right: 1px solid #afafaf;
}
#main_menu_background {
height: 100%;
- background: #b2ccdb url(/images/alchemy/gui/shading_90.png) repeat-y -15px;
+ background: #c6dbe7;
+ width: 65px;
z-index: 0;
position: absolute;
- width: 65px;
}
#logout {
@@ -765,8 +755,8 @@ div.tip {
#sub_navigation {
height: 22px;
line-height: 23px;
- padding-left: 8px;
- background: #b2ccdb url(/images/alchemy/gui/shading.png) repeat-x 0 -2px;
+ padding-left: 5px;
+ background: #c6dbe7;
border-bottom: 1px solid #afafaf;
padding-top: 4px;
z-index: 5;
@@ -810,10 +800,6 @@ div.tip {
border: 1px solid #afafaf;
border-bottom-style: none;
height: 22px;
- -webkit-box-shadow: 2px 0px 4px rgba(0, 3, 51, 0.2);
- -moz-box-shadow: 2px 0px 4px rgba(0, 3, 51, 0.2);
- -o-box-shadow: 2px 0px 4px rgba(0, 3, 51, 0.2);
- box-shadow: 2px 0px 4px rgba(0, 3, 51, 0.2);
}
#sub_navigation span.page_status_and_name .flag {
@@ -884,10 +870,6 @@ div.tip {
user-select: none;
cursor: default;
z-index: 10;
- -webkit-box-shadow: 2px 0px 4px rgba(0, 3, 51, 0.2);
- -moz-box-shadow: 2px 0px 4px rgba(0, 3, 51, 0.2);
- -o-box-shadow: 2px 0px 4px rgba(0, 3, 51, 0.2);
- box-shadow: 2px 0px 4px rgba(0, 3, 51, 0.2);
}
#sub_navigation a:hover {
@@ -902,7 +884,7 @@ div.tip {
#main_navi {
padding-left: 4px;
- padding-top: 26px;
+ padding-top: 25px;
position: absolute;
z-index: 1;
}
@@ -915,31 +897,31 @@ div.tip {
}
#main_navi a.main_navi_entry {
- color: #555;
+ color: #444;
position: relative;
text-align: center;
overflow: hidden;
display: block;
- width: 60px;
- background: #cdcdcd;
- padding-top: 6px;
+ padding-top: 7px;
-webkit-border-top-left-radius: 3px 3px;
-webkit-border-bottom-left-radius: 3px 3px;
-moz-border-radius: 3px 0px 0px 3px;
-o-border-radius: 3px 0px 0px 3px;
border-radius: 3px 0px 0px 3px;
margin-bottom: 1px;
- margin-top: 0;
- border: 1px solid #afafaf;
+ margin-top: 1px;
+ border: 1px none #afafaf;
border-right-style: none;
- padding-bottom: 4px;
+ padding-bottom: 5px;
text-shadow: #fff 0 0px 4px;
+ padding-left: 1px;
+ width: 60px;
}
#main_navi a.main_navi_entry:hover {
cursor: pointer;
text-decoration: none;
- background: #d8d8d8;
+ color: #333;
}
#main_navi a.main_navi_entry img {
@@ -952,14 +934,15 @@ div.tip {
}
#main_navi a.main_navi_entry.active {
- background: #ededed;
+ background: #baced9;
color: #333;
cursor: default;
text-shadow: #fff 0 1px 2px;
- -webkit-box-shadow: 0px 2px 4px rgba(0, 3, 51, 0.2);
- -moz-box-shadow: 0px 2px 4px rgba(0, 3, 51, 0.2);
- -o-box-shadow: 0px 2px 4px rgba(0, 3, 51, 0.2);
- box-shadow: 0px 2px 4px rgba(0, 3, 51, 0.2);
+ border: 1px solid #afafaf;
+ padding-left: 0;
+ border-right-style: none;
+ padding-top: 6px;
+ padding-bottom: 4px;
}
#main_navi #active img {
@@ -1372,7 +1355,7 @@ div#user_list_legend {
-o-border-radius: 0 0 0 3px;
border-radius: 0 0 0 3px;
position: relative;
- margin-left: 8px;
+ margin-left: 5px;
}
#toolbar form {
@@ -2198,8 +2181,6 @@ textarea.thin_border {
.thin_border,
.input_field {
- font-size: 12px;
- padding: 3px 4px 2px;
margin: 0;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
@@ -2207,7 +2188,11 @@ textarea.thin_border {
background: #fff;
border: 1px inset #e5e5e5;
width: 210px;
- height: 25px;
+ font-size: 12px;
+ line-height: 19px;
+ height: 27px;
+ padding-left: 4px;
+ padding-right: 4px;
}
.thin_border.dirty {
@@ -3376,7 +3361,6 @@ div.assign_file_file_icon img {
table.window_form td.input {
padding-top: 2px;
padding-bottom: 2px;
- padding-right: 10px;
}
#alchemy .ui-dialog-content p {
diff --git a/assets/stylesheets/elements.css b/assets/stylesheets/elements.css
index 15a9335e7d..92936e926b 100644
--- a/assets/stylesheets/elements.css
+++ b/assets/stylesheets/elements.css
@@ -301,7 +301,7 @@ div#cells {
div#element_area .sortable_cell {
min-height: 100px;
- padding: 8px;
+ padding: 8px 8px 2px;
}
.new_alchemy_element span {
@@ -686,7 +686,7 @@ div.content_editor.missing p span.icon.warning {
}
#alchemy .ui-dialog-content div.content_editor input.auto_resize {
- width: 97%;
+ width: 100%;
}
div.content_editor.validation_failed label {
diff --git a/assets/stylesheets/jquery-ui-1.8.7.alchemy.css b/assets/stylesheets/jquery-ui-1.8.7.alchemy.css
index 8b7bde816a..bf7c1a64a8 100644
--- a/assets/stylesheets/jquery-ui-1.8.7.alchemy.css
+++ b/assets/stylesheets/jquery-ui-1.8.7.alchemy.css
@@ -127,11 +127,6 @@
font-size: 1em;
}
-#alchemy .ui-widget input, #alchemy .ui-widget select, #alchemy .ui-widget textarea, #alchemy .ui-widget button {
- font-family: Lucida Grande, Lucida Sans, Arial, sans-serif;
- font-size: 1em;
-}
-
#alchemy .ui-widget-content {
border: 1px solid #afafaf;
background-color: #ededed;
@@ -144,7 +139,7 @@
#alchemy .ui-widget-header {
border: 1px none #afafaf;
- background: #c6dbe7 url(/images/alchemy/gui/shading.png) repeat-x 50% -66px;
+ background: #c6dbe7;
color: #333333;
font-weight: bold;
-moz-border-radius-bottomleft: 0 !important;
@@ -1083,8 +1078,8 @@
/* Overlays */
#alchemy .ui-widget-overlay {
- background-color: rgba(255,255,255,0.6);
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#60FFFFFF, endColorstr=#60FFFFFF);
+ background-color: rgba(229,229,229,0.4);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#40E5E5E5, endColorstr=#40E5E5E5);
}
#alchemy .ui-widget-shadow {
@@ -1474,10 +1469,6 @@ button.ui-button::-moz-focus-inner {
width: 300px;
overflow: hidden;
padding: 0;
- -webkit-box-shadow: 0px 0px 8px rgba(0, 3, 51, 0.2);
- -moz-box-shadow: 0px 0px 8px rgba(0, 3, 51, 0.2);
- -o-box-shadow: 0px 0px 8px rgba(0, 3, 51, 0.2);
- box-shadow: 0px 0px 8px rgba(0, 3, 51, 0.2);
}
#alchemy .ui-dialog .ui-dialog-titlebar {