From 04c3ece1845da1658239c8a23048dc31ed5ac431 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 3 Oct 2010 22:30:01 -0400 Subject: [PATCH] Rather than appending Google CSS to our screen.css, add a build step to copy. --- build.py | 15 ++ web_frontend/index.html | 1 + web_frontend/screen.css | 299 ---------------------------------------- 3 files changed, 16 insertions(+), 299 deletions(-) diff --git a/build.py b/build.py index 525e389..d5ddf76 100755 --- a/build.py +++ b/build.py @@ -47,6 +47,13 @@ RESOURCES_FE = [ 'screen.css', 'reset.css' ] +RESOURCES_CLOSURE = [ + 'common.css', + 'dialog.css', + 'menu.css', + 'menuitem.css', + 'menubutton.css', +] PRODUCT_NAME = 'armadillo' COMPILER = '8g' @@ -105,6 +112,14 @@ def Main(): for resource in RESOURCES_FE: print ' COPY ' + resource shutil.copy(os.path.join(FE_PATH, resource), fe_resources) + fd = open(os.path.join(fe_resources, 'closure.css'), 'w+') + for resource in RESOURCES_CLOSURE: + dest_name = 'closure_' + resource + print ' COPY ' + dest_name + shutil.copy(os.path.join(CLOSURE_DEST, 'closure', 'goog', 'css', resource), + os.path.join(fe_resources, dest_name)) + fd.write('@import url(/fe/' + dest_name + ');\n') + fd.close() # Version print '=== Version Stamp ===' diff --git a/web_frontend/index.html b/web_frontend/index.html index c9b3fc7..ef385dd 100644 --- a/web_frontend/index.html +++ b/web_frontend/index.html @@ -5,6 +5,7 @@ +

diff --git a/web_frontend/screen.css b/web_frontend/screen.css index 18c3a24..8196053 100644 --- a/web_frontend/screen.css +++ b/web_frontend/screen.css @@ -105,302 +105,3 @@ h1 { width: 50%; left: 25%; } - -/** - * Delete Confirmation Dialog - * From Google Closure Library - * - * Copyright 2009 The Closure Library Authors. All Rights Reserved. - * - * Use of this source code is governed by an Apache 2.0 License. - * See the COPYING file for details. - - * Standard styling for goog.ui.Dialog. - * - * @author ssaviano@google.com (Steven Saviano) - * @author attila@google.com (Attila Bodis) - */ - -.modal-dialog { - background: #c1d9ff; - border: 1px solid #3a5774; - color: #000; - padding: 4px; - position: absolute; -} - -.modal-dialog a, -.modal-dialog a:link, -.modal-dialog a:visited { - color: #06c; - cursor: pointer; -} - -.modal-dialog-bg { - background: #666; - left: 0; - position: absolute; - top: 0; -} - -.modal-dialog-title { - background: #e0edfe; - color: #000; - cursor: pointer; - font-size: 120%; - font-weight: bold; - padding: 8px 15px 8px 8px; - position: relative; - _zoom: 1; /* Ensures proper width in IE6 RTL. */ -} - -.modal-dialog-title-close { - /* Client apps may override the URL at which they serve the sprite. */ - background: #e0edfe url(https://ssl.gstatic.com/editor/editortoolbar.png) no-repeat -528px 0; - cursor: default; - height: 15px; - position: absolute; - right: 10px; - top: 8px; - width: 15px; - vertical-align: middle; -} - -.modal-dialog-buttons, -.modal-dialog-content { - background-color: #fff; - padding: 8px; -} - -.goog-buttonset-default { - font-weight: bold; -} - -/* - * Copyright 2007 The Closure Library Authors. All Rights Reserved. - * - * Use of this source code is governed by an Apache 2.0 License. - * See the COPYING file for details. - */ - -/* Author: pupius@google.com (Daniel Pupius) */ - -/* goog.ui.FilteredMenu */ - -.goog-menu-filter { - margin: 2px; - border: 1px solid silver; - background: white; - overflow: hidden; -} - -.goog-menu-filter div { - color: gray; - position: absolute; - padding: 1px; -} - -.goog-menu-filter input { - margin: 0; - border: 0; - background: transparent; - width: 100%; -} - -/* - * Copyright 2009 The Closure Library Authors. All Rights Reserved. - * - * Use of this source code is governed by an Apache 2.0 License. - * See the COPYING file for details. - */ - -/* - * Standard styling for buttons created by goog.ui.MenuButtonRenderer. - * - * @author attila@google.com (Attila Bodis) - */ - - -/* State: resting. */ -.goog-menu-button { - /* Client apps may override the URL at which they serve the image. */ - background: #ddd url(https://ssl.gstatic.com/editor/button-bg.png) repeat-x top left; - border: 0; - color: #000; - cursor: pointer; - list-style: none; - margin: 2px; - outline: none; - padding: 0; - text-decoration: none; - vertical-align: middle; -} - -/* Pseudo-rounded corners. */ -.goog-menu-button-outer-box, -.goog-menu-button-inner-box { - border-style: solid; - border-color: #aaa; - vertical-align: top; -} -.goog-menu-button-outer-box { - margin: 0; - border-width: 1px 0; - padding: 0; -} -.goog-menu-button-inner-box { - margin: 0 -1px; - border-width: 0 1px; - padding: 3px 4px; -} - -/* Pre-IE7 IE hack; ignored by IE7 and all non-IE browsers. */ -* html .goog-menu-button-inner-box { - /* IE6 needs to have the box shifted to make the borders line up. */ - left: -1px; -} - -/* Pre-IE7 BiDi fixes. */ -* html .goog-menu-button-rtl .goog-menu-button-outer-box { - /* @noflip */ left: -1px; - /* @noflip */ right: auto; -} -* html .goog-menu-button-rtl .goog-menu-button-inner-box { - /* @noflip */ right: auto; -} - -/* IE7-only hack; ignored by all other browsers. */ -*:first-child+html .goog-menu-button-inner-box { - /* IE7 needs to have the box shifted to make the borders line up. */ - left: -1px; -} -/* IE7 BiDi fix. */ -*:first-child+html .goog-menu-button-rtl .goog-menu-button-inner-box { - /* @noflip */ left: 1px; - /* @noflip */ right: auto; -} - -/* Safari-only hacks. */ -::root .goog-menu-button, -::root .goog-menu-button-outer-box, -::root .goog-menu-button-inner-box { - /* Required to make pseudo-rounded corners work on Safari. */ - line-height: 0; -} -::root .goog-menu-button-caption, -::root .goog-menu-button-dropdown { - /* Required to make pseudo-rounded corners work on Safari. */ - line-height: normal; -} - -/* State: disabled. */ -.goog-menu-button-disabled { - background-image: none !important; - opacity: 0.3; - -moz-opacity: 0.3; - filter: alpha(opacity=30); -} -.goog-menu-button-disabled .goog-menu-button-outer-box, -.goog-menu-button-disabled .goog-menu-button-inner-box, -.goog-menu-button-disabled .goog-menu-button-caption, -.goog-menu-button-disabled .goog-menu-button-dropdown { - color: #333 !important; - border-color: #999 !important; -} - -/* Pre-IE7 IE hack; ignored by IE7 and all non-IE browsers. */ -* html .goog-menu-button-disabled { - margin: 2px 1px !important; - padding: 0 1px !important; -} - -/* IE7-only hack; ignored by all other browsers. */ -*:first-child+html .goog-menu-button-disabled { - margin: 2px 1px !important; - padding: 0 1px !important; -} - -/* State: hover. */ -.goog-menu-button-hover .goog-menu-button-outer-box, -.goog-menu-button-hover .goog-menu-button-inner-box { - border-color: #9cf #69e #69e #7af !important; /* Hover border wins. */ -} - -/* State: active, open. */ -.goog-menu-button-active, -.goog-menu-button-open { - background-color: #bbb; - background-position: bottom left; -} - -/* State: focused. */ -.goog-menu-button-focused .goog-menu-button-outer-box, -.goog-menu-button-focused .goog-menu-button-inner-box { - border-color: orange; -} - -/* Caption style. */ -.goog-menu-button-caption { - padding: 0 4px 0 0; - vertical-align: top; -} - -/* Dropdown arrow style. */ -.goog-menu-button-dropdown { - height: 15px; - width: 7px; - /* Client apps may override the URL at which they serve the sprite. */ - background: url(https://ssl.gstatic.com/editor/editortoolbar.png) no-repeat -388px 0; - vertical-align: top; -} - -/* Pill (collapsed border) styles. */ -/* TODO(gboyer): Remove specific menu button styles and have any button support being a menu button. */ -.goog-menu-button-collapse-right, -.goog-menu-button-collapse-right .goog-menu-button-outer-box, -.goog-menu-button-collapse-right .goog-menu-button-inner-box { - margin-right: 0; -} - -.goog-menu-button-collapse-left, -.goog-menu-button-collapse-left .goog-menu-button-outer-box, -.goog-menu-button-collapse-left .goog-menu-button-inner-box { - margin-left: 0; -} - -.goog-menu-button-collapse-left .goog-menu-button-inner-box { - border-left: 1px solid #fff; -} - -.goog-menu-button-collapse-left.goog-menu-button-checked -.goog-menu-button-inner-box { - border-left: 1px solid #ddd; -} - -/* - * Copyright 2009 The Closure Library Authors. All Rights Reserved. - * - * Use of this source code is governed by an Apache 2.0 License. - * See the COPYING file for details. - */ - -/* - * Standard styling for menus created by goog.ui.MenuRenderer. - * - * @author attila@google.com (Attila Bodis) - */ - - -.goog-menu { - background: #fff; - border-color: #ccc #666 #666 #ccc; - border-style: solid; - border-width: 1px; - cursor: default; - font: normal 13px Arial, sans-serif; - margin: 0; - outline: none; - padding: 4px 0; - position: absolute; - z-index: 20000; /* Arbitrary, but some apps depend on it... */ -} -- 2.22.5