Broken styles in Administration's contextual bar (#14222)

* Wrap userEdit into contextual bar content

* Remove contextual bar header style when empty

* Fix padding in admin room info and admin user info
pull/14225/head^2
Tasso Evangelista 6 years ago committed by Guilherme Gazzo
parent abe05b6102
commit b4df795671
  1. 5
      app/theme/client/imports/components/contextual-bar.css
  2. 1
      app/theme/client/imports/general/base_old.css
  3. 4
      app/ui-admin/client/rooms/adminRoomInfo.html
  4. 7
      app/ui-admin/client/users/adminUserInfo.html
  5. 2
      app/ui-flextab/client/flexTabBar.html
  6. 4
      app/ui-flextab/client/tabs/userEdit.html
  7. 32
      package-lock.json

@ -113,6 +113,11 @@
font-size: 20px;
}
&--empty {
border-bottom: none;
background: none;
}
}
& .search-form .rc-input__icon-svg {

@ -5011,7 +5011,6 @@ rc-old select,
flex-direction: column;
height: 100%;
padding: 20px;
}
&__header {

@ -1,6 +1,6 @@
<template name="adminRoomInfo">
{{#with selectedRoom}}
<div class="content">
<section class="contextual-bar__content">
<div class="list-view channel-settings">
<div class="title">
<h2>{{_ "Room_Info"}}</h2>
@ -97,6 +97,6 @@
</nav>
{{/if}}
</div>
</div>
</section>
{{/with}}
</template>

@ -1,12 +1,9 @@
<template name="adminUserInfo">
{{#if _id}}
{{> userInfo .}}
{{else}}
<div class="edit-form">
<section class="contextual-bar__content">
<div>{{_ "Please_select_an_user"}}</div>
</div>
</section>
{{/if}}
</template>

@ -3,7 +3,7 @@
<div class="flex-tab-container border-component-color {{opened}}">
<section class="flex-tab border-component-color content-background-color">
<div class="content flex-tab__content">
<header class="contextual-bar__header">
<header class="contextual-bar__header {{#unless headerData}}contextual-bar__header--empty{{/unless}}">
{{#with headerData}}
<div class="contextual-bar__header-data">
{{> icon block="contextual-bar__header-icon" icon=icon}}

@ -1,8 +1,9 @@
<template name="userEdit">
<section class="contextual-bar__content">
{{#unless canEditOrAdd}}
<p class="secondary-font-color">{{_ "You_are_not_authorized_to_view_this_page"}}</p>
{{else}}
<form class="" action="index.html" method="post" autocomplete="off">
<form action="index.html" method="post" autocomplete="off">
<div class="rc-form-group rc-form-group--small">
<label class="rc-form-label">
{{_ "Profile_picture"}}
@ -167,4 +168,5 @@
</div>
</form>
{{/unless}}
</section>
</template>

32
package-lock.json generated

@ -8888,18 +8888,6 @@
"hoek": "2.x.x",
"joi": "6.x.x",
"wreck": "5.x.x"
},
"dependencies": {
"wreck": {
"version": "5.6.1",
"resolved": "http://registry.npmjs.org/wreck/-/wreck-5.6.1.tgz",
"integrity": "sha1-r/ADBAATiJ11YZtccYcN0qjdBpo=",
"dev": true,
"requires": {
"boom": "2.x.x",
"hoek": "2.x.x"
}
}
}
},
"heavy": {
@ -8911,20 +8899,6 @@
"boom": "2.x.x",
"hoek": "2.x.x",
"joi": "5.x.x"
},
"dependencies": {
"joi": {
"version": "5.1.0",
"resolved": "http://registry.npmjs.org/joi/-/joi-5.1.0.tgz",
"integrity": "sha1-FSrQfbjunGQBmX/1/SwSiWBwv1g=",
"dev": true,
"requires": {
"hoek": "^2.2.x",
"isemail": "1.x.x",
"moment": "2.x.x",
"topo": "1.x.x"
}
}
}
},
"hoek": {
@ -11841,7 +11815,7 @@
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"requires": {
"brace-expansion": "^1.1.7"
}
@ -12493,7 +12467,7 @@
"npmlog": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
"integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"requires": {
"are-we-there-yet": "~1.1.2",
"console-control-strings": "~1.1.0",
@ -13896,7 +13870,7 @@
"dependencies": {
"minimist": {
"version": "1.2.0",
"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
},
"simple-get": {

Loading…
Cancel
Save