Skip to content

Commit

Permalink
Settings People Revamp: Minor CSS fixes for CrOS Manage Other People
Browse files Browse the repository at this point in the history
Deletes the external stylesheets, which have been deprecated.

Also restores the correct vertical layout. Further CSS fixes to come.

Before: http://imgur.com/fypTcpf
After: http://imgur.com/GQCVtlS

BUG=563721
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/1989683002
Cr-Commit-Position: refs/heads/master@{#394476}
  • Loading branch information
tommycli authored and Commit bot committed May 18, 2016
1 parent d8317fa commit bdccd27
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 58 deletions.
26 changes: 0 additions & 26 deletions chrome/browser/resources/settings/people_page/user_list.css

This file was deleted.

26 changes: 24 additions & 2 deletions chrome/browser/resources/settings/people_page/user_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,31 @@
<link rel="import" href="chrome://md-settings/settings_shared_css.html">

<dom-module id="settings-user-list">
<link rel="import" type="css" href="user_list.css">
<template>
<style include="settings-shared"></style>
<style include="settings-shared">
.soft-border {
border: 1px solid #c4c4c4;
border-radius: 2px;
}

.user {
-webkit-padding-end: 8px;
-webkit-padding-start: 20px;
font-size: 0.75em;
height: 34px;
}

.user:hover {
background-color: #f0f0f0;
}

.user-list {
border: 1px solid gray;
height: 160px;
overflow-y: auto;
padding: 10px 0;
}
</style>
<div class="user-list soft-border">
<template is="dom-repeat" items="[[users]]">
<div class="user layout horizontal justified">
Expand Down
19 changes: 0 additions & 19 deletions chrome/browser/resources/settings/people_page/users_page.css

This file was deleted.

23 changes: 18 additions & 5 deletions chrome/browser/resources/settings/people_page/users_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,24 @@
<link rel="import" href="user_list.html">

<dom-module id="settings-users-page">
<link rel="import" type="css" href="users_page.css">
<template>
<style include="settings-shared"></style>
<style include="settings-shared">
#addUserInput {
width: 100%;
}

.add-user-button {
padding-top: 25px;
}

.users {
-webkit-margin-start: 50px;
}

paper-input {
width: 300px;
}
</style>
<div class="settings-box"
hidden$="{{computeHideOwnerLabel_(isOwner, isWhitelistManaged)}}">
$i18n{usersModifiedByOwnerLabel}
Expand All @@ -20,7 +35,7 @@
hidden$="{{computeHideManagedLabel_(isOwner, isWhitelistManaged)}}">
$i18n{settingsManagedLabel}
</div>
<div class="settings-box">
<div class="settings-box block">
<settings-checkbox
pref="{{prefs.cros.accounts.allowBWSI}}"
label="$i18n{guestBrowsingLabel}"
Expand All @@ -36,8 +51,6 @@
label="$i18n{showOnSigninLabel}"
disabled="{{editingDisabled}}">
</settings-checkbox>
</div>
<div class="settings-box">
<settings-checkbox
pref="{{prefs.cros.accounts.allowGuest}}"
id="restrictSignIn"
Expand Down
6 changes: 0 additions & 6 deletions chrome/browser/resources/settings/settings_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -916,9 +916,6 @@
type="chrome_html"
flattenhtml="true"
allowexternalscript="true" />
<structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_CSS"
file="people_page/user_list.css"
type="chrome_html" />
<structure name="IDR_SETTINGS_USERS_PAGE_JS"
file="people_page/users_page.js"
type="chrome_html" />
Expand All @@ -927,9 +924,6 @@
type="chrome_html"
flattenhtml="true"
allowexternalscript="true" />
<structure name="IDR_SETTINGS_USERS_PAGE_CSS"
file="people_page/users_page.css"
type="chrome_html" />
</if>
</structures>
</release>
Expand Down

0 comments on commit bdccd27

Please sign in to comment.