Commit 09fc641c authored by dgozman@chromium.org's avatar dgozman@chromium.org

[DevTools] Responsive design UI rework.

This change moves most of the emulation under |emulateDevice| setting.

BUG=327641

Review URL: https://codereview.chromium.org/330223004

git-svn-id: svn://svn.chromium.org/blink/trunk@176230 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent cc689614
...@@ -99,9 +99,7 @@ ...@@ -99,9 +99,7 @@
display: none; display: none;
} }
.overrides-user-agent fieldset { /* Network tab */
padding-top: 5px;
}
.overrides-network fieldset { .overrides-network fieldset {
padding-top: 5px; padding-top: 5px;
...@@ -125,6 +123,13 @@ ...@@ -125,6 +123,13 @@
width: 100%; width: 100%;
max-width: 400px; max-width: 400px;
min-width: 120px; min-width: 120px;
margin-left: 2px;
}
/* Device tab */
.overrides-device {
width: 100%;
} }
.overrides-device > select { .overrides-device > select {
...@@ -133,8 +138,12 @@ ...@@ -133,8 +138,12 @@
max-width: 90%; max-width: 90%;
} }
.overrides-device button { .overrides-device input {
margin-right: 10px; text-align: right;
}
.overrides-device input[type=range] {
width: 100%;
} }
.overrides-device > label { .overrides-device > label {
...@@ -155,59 +164,46 @@ ...@@ -155,59 +164,46 @@
margin-top: 10px; margin-top: 10px;
} }
.overrides-viewport {
width: 100%;
}
.overrides-viewport input {
text-align: right;
}
.overrides-viewport input[type=range] {
width: 100%;
}
button.overrides-swap { button.overrides-swap {
height: 20px; height: 20px;
} }
.overrides-view label { .overrides-device label {
display: flex;
height: auto;
}
.overrides-viewport label {
margin-bottom: 10px; margin-bottom: 10px;
} }
.overrides-viewport table { .overrides-device table {
margin-bottom: 5px; margin-bottom: 5px;
} }
.overrides-viewport > label { .overrides-device > label {
margin-bottom: 8px; margin-bottom: 4px;
} }
.overrides-viewport .help-footnote { .overrides-device .help-footnote {
border-top: 1px solid #EEEEEE; border-top: 1px solid #EEEEEE;
margin: 0; margin: 0;
padding: 12px; padding: 12px;
} }
.overrides-user-agent input[type=text] { .overrides-view label {
width: 400px; display: flex;
max-width: 90%; height: auto;
} }
.overrides-user-agent select { /* Screen tab */
margin: 7px 0;
.overrides-viewport > label {
margin-bottom: 4px;
} }
/* Sensors tab */
.overrides-sensors > label { .overrides-sensors > label {
margin-bottom: 10px; margin-bottom: 10px;
} }
.overrides-device, .overrides-viewport, .overrides-user-agent, .overrides-network, .overrides-sensors { .overrides-device, .overrides-viewport, .overrides-network, .overrides-sensors {
flex: none !important; flex: none !important;
} }
...@@ -217,7 +213,6 @@ button.overrides-swap { ...@@ -217,7 +213,6 @@ button.overrides-swap {
.overrides-activate-device #tab-device, .overrides-activate-device #tab-device,
.overrides-activate-viewport #tab-viewport, .overrides-activate-viewport #tab-viewport,
.overrides-activate-user-agent #tab-user-agent,
.overrides-activate-network #tab-network, .overrides-activate-network #tab-network,
.overrides-activate-sensors #tab-sensors { .overrides-activate-sensors #tab-sensors {
color: rgb(25, 100, 228); color: rgb(25, 100, 228);
...@@ -226,7 +221,6 @@ button.overrides-swap { ...@@ -226,7 +221,6 @@ button.overrides-swap {
.overrides-activate-device #tab-device.selected, .overrides-activate-device #tab-device.selected,
.overrides-activate-viewport #tab-viewport.selected, .overrides-activate-viewport #tab-viewport.selected,
.overrides-activate-user-agent #tab-user-agent.selected,
.overrides-activate-network #tab-network.selected, .overrides-activate-network #tab-network.selected,
.overrides-activate-sensors #tab-sensors.selected { .overrides-activate-sensors #tab-sensors.selected {
opacity: 1; opacity: 1;
......
...@@ -88,6 +88,11 @@ ...@@ -88,6 +88,11 @@
display: inline-block; display: inline-block;
} }
.responsive-design-screen-section > fieldset,
.responsive-design-user-agent-section > p {
margin-left: 7px;
}
.responsive-design-toolbar .responsive-design-section { .responsive-design-toolbar .responsive-design-section {
display: flex; display: flex;
flex: 1 0 auto; flex: 1 0 auto;
......
...@@ -163,6 +163,43 @@ WebInspector.SettingsUI.createSettingInputField = function(label, setting, numer ...@@ -163,6 +163,43 @@ WebInspector.SettingsUI.createSettingInputField = function(label, setting, numer
return p; return p;
} }
/**
* @param {string} label
* @param {!WebInspector.Setting} setting
* @param {number=} maxLength
* @param {string=} width
* @param {!WebInspector.Setting=} toggleSetting
* @param {string=} defaultText
*/
WebInspector.SettingsUI.createSettingLabel = function(label, setting, maxLength, width, toggleSetting, defaultText)
{
var p = document.createElement("p");
var labelElement = p.createChild("span");
labelElement.textContent = label;
if (label)
labelElement.style.marginRight = "5px";
var spanElement = p.createChild("span");
spanElement.textContent = setting.get();
if (width)
p.style.width = width;
if (toggleSetting)
toggleSetting.addChangeListener(onSettingChange);
setting.addChangeListener(onSettingChange);
onSettingChange();
function onSettingChange()
{
var text = toggleSetting && !toggleSetting.get() ? (defaultText || "") : setting.get();
spanElement.title = text;
if (maxLength && text.length > maxLength)
text = text.substring(0, maxLength - 2) + "...";
spanElement.textContent = text;
}
return p;
}
WebInspector.SettingsUI.createCustomSetting = function(name, element) WebInspector.SettingsUI.createCustomSetting = function(name, element)
{ {
var p = document.createElement("p"); var p = document.createElement("p");
......
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