Skip to content

GitLab

T
tangled
Commit 0302430a authored by Kuo Jen Wei's avatar Kuo Jen Wei Committed by Chromium LUCI CQ
Browse files
Options

CCA: Turn all underscore class name to dash style 

Bug: b/172340545
Test: tast -verbose run <DUT> "camera.CCA*"

Change-Id: I335453587a3e79083b64b9fbd8409cbd3b0d0978
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2596588Reviewed-by: default avatarShik Chen <shik@chromium.org>
Commit-Queue: Inker Kuo <inker@chromium.org>
Auto-Submit: Inker Kuo <inker@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840925}
parent 267e9d60
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 41 deletions
chromeos/components/camera_app_ui/resources/css/main.css
View file @ 0302430a
......@@ -653,11 +653,11 @@ body.max-wnd #options-group {
margin: var(--option-item-vpadding) 0;
}
body._3sec #toggle-timer:checked {
body.timer-3s #toggle-timer:checked {
background-image: url(/images/camera_button_timer_on_3s.svg);
}
body._10sec #toggle-timer:checked {
body.timer-10s #toggle-timer:checked {
background-image: url(/images/camera_button_timer_on_10s.svg);
}
......@@ -704,11 +704,11 @@ body:not(.video) #toggle-fps {
display: none;
}
body._30fps #toggle-fps {
body.fps-30 #toggle-fps {
background-image: url(/images/camera_button_fps_30.svg);
}
body._60fps #toggle-fps {
body.fps-60 #toggle-fps {
background-image: url(/images/camera_button_fps_60.svg);
}
......@@ -955,7 +955,7 @@ body:not(.expert) #settings-expert {
transform: translateY(-50%);
}
body._4x4 #preview-grid-horizontal::before {
body.grid-4x4 #preview-grid-horizontal::before {
border-bottom: 1px solid white;
content: '';
height: 0;
......@@ -965,20 +965,20 @@ body._4x4 #preview-grid-horizontal::before {
top: 0;
}
body.grid._3x3 #preview-grid-horizontal,
body.view-grid-settings._3x3 #preview-grid-horizontal {
body.grid-3x3 #preview-grid-horizontal,
body.view-grid-settings.grid-3x3 #preview-grid-horizontal {
height: 33.333%;
}
body.grid.golden #preview-grid-horizontal,
body.view-grid-settings.golden #preview-grid-horizontal {
body.grid.grid-golden #preview-grid-horizontal,
body.view-grid-settings.grid-golden #preview-grid-horizontal {
height: 23.607%;
}
body.grid._4x4 #preview-grid-horizontal,
body.grid._4x4 #preview-grid-horizontal::before,
body.view-grid-settings._4x4 #preview-grid-horizontal,
body.view-grid-settings._4x4 #preview-grid-horizontal::before {
body.grid.grid-4x4 #preview-grid-horizontal,
body.grid.grid-4x4 #preview-grid-horizontal::before,
body.view-grid-settings.grid-4x4 #preview-grid-horizontal,
body.view-grid-settings.grid-4x4 #preview-grid-horizontal::before {
height: 50%;
}
......@@ -993,7 +993,7 @@ body.view-grid-settings._4x4 #preview-grid-horizontal::before {
width: 100%;
}
body._4x4 #preview-grid-vertical::before {
body.grid-4x4 #preview-grid-vertical::before {
border-right: 1px solid white; /* csschecker-disable-line left-right */
bottom: 0;
content: '';
......@@ -1003,20 +1003,20 @@ body._4x4 #preview-grid-vertical::before {
width: 0;
}
body.grid._3x3 #preview-grid-vertical,
body.view-grid-settings._3x3 #preview-grid-vertical {
body.grid.grid-3x3 #preview-grid-vertical,
body.view-grid-settings.grid-3x3 #preview-grid-vertical {
width: 33.333%;
}
body.grid.golden #preview-grid-vertical,
body.view-grid-settings.golden #preview-grid-vertical {
body.grid.grid-golden #preview-grid-vertical,
body.view-grid-settings.grid-golden #preview-grid-vertical {
width: 23.607%;
}
body.grid._4x4 #preview-grid-vertical,
body.grid._4x4 #preview-grid-vertical::before,
body.view-grid-settings._4x4 #preview-grid-vertical,
body.view-grid-settings._4x4 #preview-grid-vertical::before {
body.grid.grid-4x4 #preview-grid-vertical,
body.grid.grid-4x4 #preview-grid-vertical::before,
body.view-grid-settings.grid-4x4 #preview-grid-vertical,
body.view-grid-settings.grid-4x4 #preview-grid-vertical::before {
width: 50%;
}
......@@ -1343,11 +1343,11 @@ body:not(.has-front-camera):not(.has-back-camera) #builtin-video-header {
display: none;
}
body._3x3 .description span[i18n-content=label_grid_3x3],
body._4x4 .description span[i18n-content=label_grid_4x4],
body.golden .description span[i18n-content=label_grid_golden],
body._3sec .description span[i18n-content=label_timer_3s],
body._10sec .description span[i18n-content=label_timer_10s],
body.grid-3x3 .description span[i18n-content=label_grid_3x3],
body.grid-4x4 .description span[i18n-content=label_grid_4x4],
body.grid-golden .description span[i18n-content=label_grid_golden],
body.timer-3s .description span[i18n-content=label_timer_3s],
body.timer-10s .description span[i18n-content=label_timer_10s],
.menu-item.resol-item .description span {
display: inline;
}
......
chromeos/components/camera_app_ui/resources/js/device/constraints_preferrer.js
View file @ 0302430a
......@@ -289,7 +289,7 @@ export class VideoConstraintsPreferrer extends ConstraintsPreferrer {
}
this.toggleFps_.checked = prefFps === 60;
SUPPORTED_CONSTANT_FPS.forEach(
(fps) => state.set(state.assertState(`_${fps}fps`), fps === prefFps));
(fps) => state.set(state.assertState(`fps-${fps}`), fps === prefFps));
this.prefFpses_[deviceId] = this.prefFpses_[deviceId] || {};
this.prefFpses_[deviceId][resolution] = prefFps;
this.saveFpsPreference_();
......
chromeos/components/camera_app_ui/resources/js/state.js
View file @ 0302430a
......@@ -17,11 +17,11 @@ export const State = {
CAMERA_CONFIGURING: 'camera-configuring',
CAMERA_SWITCHING: 'camera-switching',
EXPERT: 'expert',
FPS_30: '_30fps',
FPS_60: '_60fps',
GRID_3x3: '_3x3',
GRID_4x4: '_4x4',
GRID_GOLDEN: 'golden',
FPS_30: 'fps-30',
FPS_60: 'fps-60',
GRID_3x3: 'grid-3x3',
GRID_4x4: 'grid-4x4',
GRID_GOLDEN: 'grid-golden',
GRID: 'grid',
HAS_BACK_CAMERA: 'has-back-camera',
HAS_EXTERNAL_SCREEN: 'has-external-screen',
......@@ -56,8 +56,8 @@ export const State = {
TAB_NAVIGATION: 'tab-navigation',
TAKING: 'taking',
TALL: 'tall',
TIMER_10SEC: '_10sec',
TIMER_3SEC: '_3sec',
TIMER_10SEC: 'timer-10s',
TIMER_3SEC: 'timer-3s',
TIMER: 'timer',
};
......
chromeos/components/camera_app_ui/resources/views/main.html
View file @ 0302430a
......@@ -23,7 +23,7 @@
<script src="/js/mojo/camera_app_helper.mojom-lite.js"></script>
<script type="module" src="/js/init.js"></script>
</head>
<body class="sound mirror mic _3x3 view-splash">
<body class="sound mirror mic grid-3x3 view-splash">
<div id="view-camera">
<div id="preview-box">
<div id="preview-viewport">
......@@ -279,17 +279,19 @@
</div>
<label class="menu-item circle">
<input id="grid-3x3" class="icon" type="radio" tabindex="0"
name="gridtype" data-state="_3x3" data-key="toggle3x3" checked>
name="gridtype" data-state="grid-3x3" data-key="toggle3x3"
checked>
<span i18n-content="label_grid_3x3" i18n-aria="aria_grid_3x3"></span>
</label>
<label class="menu-item circle">
<input id="grid-4x4" class="icon" type="radio" tabindex="0"
name="gridtype" data-state="_4x4" data-key="toggle4x4">
name="gridtype" data-state="grid-4x4" data-key="toggle4x4">
<span i18n-content="label_grid_4x4" i18n-aria="aria_grid_4x4"></span>
</label>
<label class="menu-item circle">
<input id="grid-golden" class="icon" type="radio" tabindex="0"
name="gridtype" data-state="golden" data-key="toggleGolden">
name="gridtype" data-state="grid-golden"
data-key="toggleGolden">
<span i18n-content="label_grid_golden"></span>
</label>
</div>
......@@ -302,13 +304,13 @@
</div>
<label class="menu-item circle">
<input id="timer-3s" class="icon" type="radio" tabindex="0"
name="timerdur" data-state="_3sec" data-key="toggle3sec"
name="timerdur" data-state="timer-3s" data-key="toggle3sec"
checked>
<span i18n-content="label_timer_3s"></span>
</label>
<label class="menu-item circle">
<input id="timer-10s" class="icon" type="radio" tabindex="0"
name="timerdur" data-state="_10sec" data-key="toggle10sec">
name="timerdur" data-state="timer-10s" data-key="toggle10sec">
<span i18n-content="label_timer_10s"></span>
</label>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment