summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-23 22:51:36 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-23 22:51:36 +0000
commit99efd3fe6ced68bcf845a93bf0cd76f9d1805b6b (patch)
tree3662b93b2bc6c7dbae94360a1fa3519dd2bc5961 /chrome/browser/resources
parentdf80721564599a9189c9dab4010770b7b8cec04d (diff)
downloadchromium_src-99efd3fe6ced68bcf845a93bf0cd76f9d1805b6b.zip
chromium_src-99efd3fe6ced68bcf845a93bf0cd76f9d1805b6b.tar.gz
chromium_src-99efd3fe6ced68bcf845a93bf0cd76f9d1805b6b.tar.bz2
remove chrome_shared.css once and for all
copied relevant style rules to print_preview.css BUG=103688 TEST=manual Review URL: https://chromiumcodereview.appspot.com/10408074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/feedback.js4
-rw-r--r--chrome/browser/resources/print_preview/print_preview.css30
-rw-r--r--chrome/browser/resources/print_preview/print_preview.html3
-rw-r--r--chrome/browser/resources/shared/css/chrome_shared.css202
-rw-r--r--chrome/browser/resources/shared_resources.grd2
5 files changed, 26 insertions, 215 deletions
diff --git a/chrome/browser/resources/feedback.js b/chrome/browser/resources/feedback.js
index 2c388c4..9d96fcb 100644
--- a/chrome/browser/resources/feedback.js
+++ b/chrome/browser/resources/feedback.js
@@ -213,10 +213,6 @@ function load() {
$('send-report-button').onclick = sendReport;
$('cancel-button').onclick = cancel;
- var menuOffPattern = /(^\?|&)menu=off($|&)/;
- var menuDisabled = menuOffPattern.test(window.location.search);
- document.documentElement.setAttribute('hide-menu', menuDisabled);
-
// Set default values for the possible parameters, and then parse the actual
// values from the URL hash.
var parameters = {
diff --git a/chrome/browser/resources/print_preview/print_preview.css b/chrome/browser/resources/print_preview/print_preview.css
index 8ce7f0a..b484c2a 100644
--- a/chrome/browser/resources/print_preview/print_preview.css
+++ b/chrome/browser/resources/print_preview/print_preview.css
@@ -15,23 +15,37 @@ body {
/* Header */
header {
+ -webkit-padding-end: 14px;
-webkit-padding-start: 16px;
}
#print-preview #navbar-container {
+ -webkit-border-end: 1px solid rgb(198, 201, 206);
-webkit-box-orient: vertical;
-webkit-user-select: none;
+ background-color: #f1f1f1;
+ bottom: 0;
display: -webkit-box;
+ /* We set both left and right for the sake of RTL. */
+ left: 0;
+ position: fixed;
+ right: 0;
+ top: 0;
width: 310px;
+ z-index: 2;
}
-#print-preview #navbar-content-title {
- cursor: default;
- text-align: start;
+#navbar-content-title {
+ color: #333;
+ font-size: 200%;
+ font-weight: normal;
+ margin: 0;
+ padding-bottom: 14px;
+ padding-top: 13px;
+ text-shadow: white 0 1px 2px;
}
#print-header {
- -webkit-padding-end: 14px;
padding-bottom: 10px;
padding-top: 10px;
}
@@ -299,12 +313,18 @@ html[dir='rtl'] #decrement {
/* PDF view */
-#print-preview #mainview {
+#mainview {
-webkit-margin-start: 310px;
-webkit-padding-start: 0;
-webkit-user-select: none;
background-color: #ccc;
+ bottom: 0;
+ left: 0;
overflow: hidden;
+ position: absolute;
+ right: 0;
+ top: 0;
+ z-index: 1;
}
#pdf-viewer {
diff --git a/chrome/browser/resources/print_preview/print_preview.html b/chrome/browser/resources/print_preview/print_preview.html
index a4cdc2b..1090875 100644
--- a/chrome/browser/resources/print_preview/print_preview.html
+++ b/chrome/browser/resources/print_preview/print_preview.html
@@ -7,9 +7,8 @@
<link rel="stylesheet" href="margins.css">
<link rel="stylesheet" href="print_preview.css">
-<link rel="stylesheet" href="../shared/css/chrome_shared.css">
+<link rel="stylesheet" href="../shared/css/chrome_shared2.css">
<link rel="stylesheet" href="../shared/css/throbber.css">
-<link rel="stylesheet" href="../shared/css/widgets.css">
<script src="chrome://resources/js/cr.js"></script>
<script src="chrome://resources/js/event_tracker.js"></script>
diff --git a/chrome/browser/resources/shared/css/chrome_shared.css b/chrome/browser/resources/shared/css/chrome_shared.css
deleted file mode 100644
index 428c784..0000000
--- a/chrome/browser/resources/shared/css/chrome_shared.css
+++ /dev/null
@@ -1,202 +0,0 @@
-/* Copyright (c) 2012 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-/* Styles common to WebUI pages that share the options pages style */
-body {
- cursor: default;
- font-size: 13px;
-}
-
-a:link {
- color: rgb(63, 110, 194);
-}
-
-a:active {
- color: rgb(37, 64, 113);
-}
-
-#navbar-content-title {
- -webkit-padding-end: 24px;
- -webkit-user-select: none;
- color: #333;
- cursor: pointer;
- font-size: 200%;
- font-weight: normal;
- margin: 0;
- padding-bottom: 14px;
- padding-top: 13px;
- text-align: end;
- text-shadow: white 0 1px 2px;
-}
-
-#main-content {
- bottom: 0;
- display: -webkit-box;
- left: 0;
- position: absolute;
- right: 0;
- top: 0;
-}
-
-#navbar {
- margin: 0;
-}
-
-#navbar-container {
- -webkit-border-end: 1px solid rgb(198, 201, 206);
- background-color: #f1f1f1;
- bottom: 0;
- /* We set both left and right for the sake of RTL. */
- left: 0;
- position: fixed;
- right: 0;
- top: 0;
- width: 216px;
- z-index: 2;
-}
-
-html.hide-menu #navbar-container {
- display: none;
-}
-
-#navbar-container > ul {
- -webkit-user-select: none;
- list-style-type: none;
- margin: 0;
- padding: 0;
-}
-
-.navbar-item {
- -webkit-padding-end: 24px;
- -webkit-padding-start: 0;
- border-bottom: 1px solid transparent;
- border-top: 1px solid transparent;
- color: #333;
- cursor: pointer;
- display: block;
- font-size: 105%;
- outline: none;
- padding-bottom: 7px;
- padding-top: 7px;
- text-align: end;
- text-shadow: white 0 1px 1px;
-}
-
-.navbar-item:focus,
-.navbar-item-selected {
- border-bottom: 1px solid rgb(143, 170, 217);
- border-top: 1px solid rgb(143, 170, 217);
-}
-
-.navbar-item-selected {
- -webkit-box-shadow: 0 1px 0 #f7f7f7;
- background-color: rgb(187, 206, 233);
- color: black;
- text-shadow: rgb(187, 206, 233) 0 1px 1px;
-}
-
-#mainview {
- -webkit-box-align: stretch;
- -webkit-padding-start: 216px;
- bottom: 0;
- left: 0;
- margin: 0;
- position: absolute;
- right: 0;
- top: 0;
- z-index: 1;
-}
-
-html.hide-menu #mainview {
- -webkit-padding-start: 0;
-}
-
-#mainview-content {
- min-height: 100%;
- position: relative;
-}
-
-#page-container {
- box-sizing: border-box;
- max-width: 888px;
- min-width: 600px;
- padding: 0 24px;
-}
-
-div.disabled {
- color: #888;
-}
-
-/* TEXT */
-input[type='password'],
-input[type='text'],
-input[type='url'],
-input:not([type]) {
- -webkit-border-radius: 2px;
- border: 1px solid #aaa;
- box-sizing: border-box;
- font: inherit;
- height: 2em;
- padding: 4px;
-}
-
-input[type='text']:disabled {
- color: #888;
-}
-
-/* Elements that need to be LTR even in an RTL context, but should align
- * right. (Namely, URLs, search engine names, etc.)
- */
-html[dir='rtl'] .weakrtl {
- direction: ltr;
- text-align: right;
-}
-
-/* Input fields in search engine table need to be weak-rtl. Since those input
- * fields are generated for all cr.ListItem elements (and we only want weakrtl
- * on some), the class needs to be on the enclosing div.
- */
-html[dir='rtl'] div.weakrtl input {
- direction: ltr;
- text-align: right;
-}
-
-html[dir='rtl'] .favicon-cell.weakrtl {
- -webkit-padding-end: 22px;
- -webkit-padding-start: 0;
-}
-
-/* weakrtl for selection drop downs needs to account for the fact that
- * Webkit does not honor the text-align attribute for the select element.
- * (See Webkit bug #40216)
- */
-html[dir='rtl'] select.weakrtl {
- direction: rtl;
-}
-
-html[dir='rtl'] select.weakrtl option {
- direction: ltr;
-}
-
-/* WebKit does not honor alignment for text specified via placeholder attrib.
- * This CSS is a workaround. Please remove once WebKit bug is fixed.
- * https://bugs.webkit.org/show_bug.cgi?id=63367
- */
-html[dir='rtl'] input.weakrtl::-webkit-input-placeholder,
-html[dir='rtl'] .weakrtl input::-webkit-input-placeholder {
- direction: rtl;
-}
-
-.page h1 {
- -webkit-padding-end: 24px;
- -webkit-user-select: none;
- border-bottom: 1px solid #eee;
- color: #333;
- font-size: 200%;
- font-weight: normal;
- margin: 0;
- padding-bottom: 4px;
- padding-top: 13px;
- text-shadow: white 0 1px 2px;
-}
diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd
index 01335a8..9032c9d 100644
--- a/chrome/browser/resources/shared_resources.grd
+++ b/chrome/browser/resources/shared_resources.grd
@@ -26,8 +26,6 @@ without changes to the corresponding grd file. -->
<include name="IDR_SHARED_CSS_MENU_BUTTON"
file="shared/css/menu_button.css" type="BINDATA"
flattenhtml="true" />
- <include name="IDR_SHARED_CSS_CHROME"
- file="shared/css/chrome_shared.css" type="BINDATA" />
<include name="IDR_SHARED_CSS_CHROME2"
file="shared/css/chrome_shared2.css" type="BINDATA"
flattenhtml="true" />