Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Side by Side Diff: chrome/browser/resources/chromeos/login/oobe.css

Issue 10854071: New OOBE design: minor content update (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/oobe_screen_network.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. 3 * found in the LICENSE file.
4 * 4 *
5 * This is the stylesheet used by the Out of the box experience (OOBE) flow, 5 * This is the stylesheet used by the Out of the box experience (OOBE) flow,
6 * sign in and lock screens. 6 * sign in and lock screens.
7 */ 7 */
8 8
9 html, 9 html,
10 body { 10 body {
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 display: none; 233 display: none;
234 } 234 }
235 235
236 #step-logo { 236 #step-logo {
237 -webkit-margin-start: 17px; 237 -webkit-margin-start: 17px;
238 position: absolute; 238 position: absolute;
239 top: 15px; 239 top: 15px;
240 } 240 }
241 241
242 html[oobe=new] #connect .step-contents { 242 html[oobe=new] #connect .step-contents {
243 /* TODO(nkostylev): Update after content layout changes. */
244 -webkit-margin-after: 82px; 243 -webkit-margin-after: 82px;
245 -webkit-margin-before: 82px; 244 -webkit-margin-before: 33px;
246 -webkit-margin-start: 145px; 245 -webkit-margin-start: 145px;
247 } 246 }
248 247
249 html[oobe=new] #eula .step-contents { 248 html[oobe=new] #eula .step-contents {
250 -webkit-margin-after: 30px; 249 -webkit-margin-after: 30px;
251 -webkit-margin-start: 32px; 250 -webkit-margin-start: 32px;
252 } 251 }
253 252
254 html[oobe=new] #gaia-signin .step-contents { 253 html[oobe=new] #gaia-signin .step-contents {
255 -webkit-box-pack: center; 254 -webkit-box-pack: center;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 } 364 }
366 365
367 html[oobe=new] #progress-dots { 366 html[oobe=new] #progress-dots {
368 -webkit-box-pack: center; 367 -webkit-box-pack: center;
369 -webkit-margin-before: 15px; 368 -webkit-margin-before: 15px;
370 display: -webkit-box; 369 display: -webkit-box;
371 } 370 }
372 371
373 .progdot { 372 .progdot {
374 -webkit-margin-end: 12px; 373 -webkit-margin-end: 12px;
375 background: black;
376 opacity: 0.4; 374 opacity: 0.4;
377 } 375 }
378 376
379 html[oobe=old] .progdot { 377 html[oobe=old] .progdot {
378 background: black;
380 border-radius: 2px; 379 border-radius: 2px;
381 height: 8px; 380 height: 8px;
382 width: 8px; 381 width: 8px;
383 } 382 }
384 383
385 html[oobe=new] .progdot { 384 html[oobe=new] .progdot {
386 background: white; 385 background: white;
387 height: 10px; 386 height: 10px;
388 width: 10px; 387 width: 10px;
389 } 388 }
390 389
391 .progdot-active { 390 .progdot-active {
392 opacity: 0.5; 391 opacity: 0.5;
393 } 392 }
394 393
395 .control-with-label { 394 .control-with-label {
396 -webkit-box-align: start; 395 -webkit-box-align: start;
397 display: -webkit-box; 396 display: -webkit-box;
398 margin: 10px 0; 397 margin: 10px 0;
399 } 398 }
400 399
401 .menu-area { 400 .menu-area {
402 margin: 5px; 401 margin: 5px;
403 } 402 }
404 403
405 .menu-control { 404 .menu-control {
405 color: #444;
406 font-family: inherit; 406 font-family: inherit;
407 line-height: 20px; 407 line-height: 20px;
408 position: relative; 408 position: relative;
409 width: 250px; 409 width: 250px;
410 } 410 }
411 411
412 .label, 412 .label,
413 .flexible-label { 413 .flexible-label {
414 display: block; 414 display: block;
415 margin: 5px 5px 5px 0; 415 margin: 5px 5px 5px 0;
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 #oobe.user-image #ok-button, 741 #oobe.user-image #ok-button,
742 #oobe.oauth-enrollment #oauth-enroll-cancel-button, 742 #oobe.oauth-enrollment #oauth-enroll-cancel-button,
743 #oobe.oauth-enrollment #oauth-enroll-try-again-button, 743 #oobe.oauth-enrollment #oauth-enroll-try-again-button,
744 #oobe.oauth-enrollment #oauth-enroll-explain-button, 744 #oobe.oauth-enrollment #oauth-enroll-explain-button,
745 #oobe.oauth-enrollment #oauth-enroll-done-button { 745 #oobe.oauth-enrollment #oauth-enroll-done-button {
746 display: block; 746 display: block;
747 } 747 }
748 748
749 #oobe.connect #connect-dot, 749 #oobe.connect #connect-dot,
750 #oobe.eula #eula-dot, 750 #oobe.eula #eula-dot,
751 #oobe.update #update-dot,
751 #oobe.signin #signin-dot, 752 #oobe.signin #signin-dot,
752 #oobe.gaia-signin #gaia-signin-dot, 753 #oobe.gaia-signin #gaia-signin-dot,
753 #oobe.enrollment #signin-dot, 754 #oobe.enrollment #signin-dot,
754 #oobe.enrollment #gaia-signin-dot, 755 #oobe.enrollment #gaia-signin-dot,
755 #oobe.oauth-enrollment #signin-dot, 756 #oobe.oauth-enrollment #signin-dot,
756 #oobe.oauth-enrollment #gaia-signin-dot, 757 #oobe.oauth-enrollment #gaia-signin-dot,
757 #oobe.user-image #user-image-dot { 758 #oobe.user-image #user-image-dot {
758 opacity: 1; 759 opacity: 1;
759 } 760 }
760 761
761 #account-picker-dot, 762 #account-picker-dot,
762 #enrollment-dot, 763 #enrollment-dot,
763 #oauth-enrollment-dot, 764 #oauth-enrollment-dot {
764 #update-dot {
765 display: none; 765 display: none;
766 } 766 }
767 767
768 #welcome-message {
769 color: #444;
770 font-size: 16px;
771 margin-bottom: 30px;
772 width: 435px;
773 }
774
768 #connect table { 775 #connect table {
769 margin: 7em auto; 776 margin: 7em auto;
770 } 777 }
771 778
772 /* TODO(nkostylev): Cleanup, security-info - old design, 779 /* TODO(nkostylev): Cleanup, security-info - old design,
773 security-tpm - new design. */ 780 security-tpm - new design. */
774 #security-info { 781 #security-info {
775 bottom: 10px; 782 bottom: 10px;
776 left: 0; 783 left: 0;
777 position: absolute; 784 position: absolute;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 } 817 }
811 818
812 html[dir=ltr] #security-tpm { 819 html[dir=ltr] #security-tpm {
813 left: 49px; 820 left: 49px;
814 } 821 }
815 822
816 html[dir=rtl] #security-tpm { 823 html[dir=rtl] #security-tpm {
817 right: 49px; 824 right: 49px;
818 } 825 }
819 826
820 html[oobe=old] #update div, 827 html[oobe=old] #update div {
821 #update #update-screen-curtain {
822 width: 32em; 828 width: 32em;
823 } 829 }
824 830
825 html[oobe=old] #update div { 831 html[oobe=old] #update div {
826 margin: 6em auto; 832 margin: 6em auto;
827 } 833 }
828 834
829 #update-screen-curtain p { 835 #update-screen-curtain p {
830 text-align: center; 836 text-align: center;
831 } 837 }
832 838
833 #update #update-screen-curtain { 839 #update #update-screen-curtain {
834 -webkit-box-align: start; 840 -webkit-box-align: start;
835 -webkit-box-pack: center; 841 -webkit-box-pack: center;
842 }
843
844 #update #update-checking-progress {
845 -webkit-box-align: start;
846 -webkit-box-pack: center;
847 color: #9c9c9c;
836 display: -webkit-box; 848 display: -webkit-box;
837 } 849 }
838 850
851
839 html[oobe=old] #update #update-screen-curtain { 852 html[oobe=old] #update #update-screen-curtain {
840 margin: 9em auto; 853 margin: 9em auto;
841 } 854 }
842 855
843 html[oobe=new] #update #update-screen-curtain { 856 html[oobe=new] #update #update-screen-curtain {
844 margin: 120px auto; 857 margin: 87px 45px;
845 } 858 }
846 859
847 html[oobe=new] #update-screen-main { 860 html[oobe=new] #update-screen-main {
848 /* TODO(nkostylev): Update after strings are updated. */ 861 margin: 85px 45px;
849 margin: 85px auto;
850 min-height: 114px; 862 min-height: 114px;
851 width: 448px; 863 text-align: center;
852 } 864 }
853 865
854 #update #update-checking-ellipsis { 866 #update #update-checking-ellipsis {
855 width: 16px; 867 width: 16px;
856 } 868 }
857 869
858 html[dir=ltr] #update #update-checking-ellipsis { 870 html[dir=ltr] #update #update-checking-ellipsis {
859 text-align: left; 871 text-align: left;
860 } 872 }
861 873
(...skipping 19 matching lines...) Expand all
881 } 893 }
882 894
883 html[oobe=new][dir=rtl] #update #update-cancel-hint { 895 html[oobe=new][dir=rtl] #update #update-cancel-hint {
884 right: 137px; 896 right: 137px;
885 } 897 }
886 898
887 #update #update-upper-label { 899 #update #update-upper-label {
888 -webkit-margin-after: 4px; 900 -webkit-margin-after: 4px;
889 } 901 }
890 902
903 #update #checking-updates-label {
904 -webkit-margin-after: 34px;
905 }
906
891 #update #update-bottom-label { 907 #update #update-bottom-label {
892 -webkit-margin-after: 4px; 908 -webkit-margin-after: 4px;
893 -webkit-margin-before: 4px; 909 -webkit-margin-before: 4px;
910 text-align: left;
911 }
912
913 html[oobe=old] #update progress {
914 -webkit-margin-start: 74px;
894 } 915 }
895 916
896 #update progress { 917 #update progress {
897 -webkit-margin-after: 4px; 918 -webkit-margin-after: 4px;
898 -webkit-margin-before: 34px; 919 -webkit-margin-before: 34px;
899 -webkit-margin-start: 74px;
900 height: 15px; 920 height: 15px;
901 width: 300px; 921 width: 300px;
902 } 922 }
903 923
904 #update #update-estimated-time-left { 924 #update #update-estimated-time-left {
905 -webkit-margin-before: 4px; 925 -webkit-margin-before: 4px;
906 } 926 }
907 927
908 #update #update-estimated-time-left { 928 #update #update-estimated-time-left {
909 color: #666; 929 color: #a3a3a3;
910 font-size: 13px; 930 font-size: 13px;
911 text-align: center; 931 text-align: center;
912 } 932 }
913 933
914 .eula-columns { 934 .eula-columns {
915 display: -webkit-box; 935 display: -webkit-box;
916 width: 630px; 936 width: 630px;
917 } 937 }
918 938
919 .eula-frame { 939 .eula-frame {
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 width: 100%; 1319 width: 100%;
1300 } 1320 }
1301 1321
1302 .background-initial { 1322 .background-initial {
1303 opacity: 0; 1323 opacity: 0;
1304 } 1324 }
1305 1325
1306 .background-final { 1326 .background-final {
1307 opacity: 1; 1327 opacity: 1;
1308 } 1328 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/oobe_screen_network.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698