Permalink
Browse files

Final touch on My Account

  • Loading branch information...
1 parent 14c986d commit 5e3aea5a47785d909650312375e9e8bf9a44d2a4 @cdujeu cdujeu committed Sep 12, 2016
@@ -65,6 +65,20 @@
-ms-flex: 1;
flex: 1;
}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .title-flex h3 .legend {
+ font-size: 12px;
+ font-weight: 300;
+ line-height: 1.3em;
+ margin-top: 3px;
+}
+#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .title-flex h3.dashboard_panel_title {
+ margin-top: 16px;
+ padding-left: 20px;
+ font-size: 24px;
+ line-height: 32px;
+ font-weight: 400;
+ color: rgba(0, 0, 0, 0.87);
+}
#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .title-flex div.actionBar,
#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div .title-flex div.action_bar {
margin: 20px 20px 0 0;
@@ -95,14 +109,6 @@
margin: 0 0 10px;
}
}
-#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div h3.dashboard_panel_title {
- margin-top: 16px;
- padding-left: 20px;
- font-size: 24px;
- line-height: 32px;
- font-weight: 400;
- color: rgba(0, 0, 0, 0.87);
-}
#userdashboard_main_tab.horizontal_tabulator div.tabulatorPanelsContainer > div div.class-FetchedResultPane {
border-top: 1px solid #fafafa;
background-color: #ffffff;
@@ -62,6 +62,20 @@
display: flex;
h3{
flex: 1;
+ .legend{
+ font-size: 12px;
+ font-weight: 300;
+ line-height: 1.3em;
+ margin-top: 3px;
+ }
+ &.dashboard_panel_title{
+ margin-top: 16px;
+ padding-left: 20px;
+ font-size: 24px;
+ line-height: 32px;
+ font-weight: 400;
+ color: rgba(0, 0, 0, 0.87);
+ }
}
div.actionBar, div.action_bar{
margin: 20px 20px 0 0;
@@ -89,14 +103,6 @@
}
}
}
- h3.dashboard_panel_title{
- margin-top: 16px;
- padding-left: 20px;
- font-size: 24px;
- line-height: 32px;
- font-weight: 400;
- color: rgba(0, 0, 0, 0.87);
- }
div.class-FetchedResultPane{
border-top: 1px solid rgb(250,250,250);
&#shared_files_list{
@@ -112,7 +112,7 @@
paneInfo='{"type":"widget"}'><![CDATA[
<div id="my-users-pane" ajxpClass="AjxpPane" class="tabbed_editor">
<div class="title-flex">
- <h3 class="dashboard_panel_title">AJXP_MESSAGE[user_dash.46]</h3>
+ <h3 class="dashboard_panel_title">AJXP_MESSAGE[user_dash.46]<div class="legend">AJXP_MESSAGE[user_dash.49]</div></h3>
<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"address_book","toolbarsList":["change","address_book"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
</div>
<div id="address_book" ajxpClass="FetchedResultPane" ajxpOptions='{"updateGlobalContext":false,"nodeProviderProperties":{"get_action":"ls","dir":"users"}, "displayMode":"detail","replaceScroller":true, "fit":"height", "cellPaddingCorrection":6, "iconBgPosition" : "5px 4px"}'></div>
@@ -73,7 +73,10 @@
return (
<div className="react-mui-context">
<div className="title-flex">
- <h3 style={{paddingLeft:20}}>{pydio.MessageHash['user_dash.43']}</h3>
+ <h3 style={{paddingLeft:20}}>
+ {pydio.MessageHash['user_dash.43']}
+ <div className="legend">{pydio.MessageHash['user_dash.43t']}</div>
+ </h3>
<div className="actionBar">
{saveButton}&nbsp;&nbsp;
{this.getButton('pass_change', 194)}
@@ -260,16 +263,20 @@
return (
<div className="react-mui-context">
<div className="title-flex">
- <h3 style={{paddingLeft:20}}>{this.getMessage(403)}</h3>
+ <h3 style={{paddingLeft:20}}>
+ {this.getMessage(403)}
+ <div className="legend">{this.getMessage(404)}</div>
+ </h3>
</div>
<div style={{padding:20}}>
<ReactMUI.Toggle
label={this.getMessage(406)}
toggled={webdavActive}
onToggle={this.onToggleChange}/>
- <div style={{paddingTop: 20}}>{this.getMessage(404)}</div>
- {webdavActive ? this.renderPasswordField() : null}
- {webdavActive ? this.renderURLList() : null}
+ <div style={{paddingTop: 20}}>
+ {webdavActive ? this.renderPasswordField() : null}
+ {webdavActive ? this.renderURLList() : null}
+ </div>
</div>
</div>
);
@@ -432,7 +432,7 @@
paneInfo='{"type":"widget"}'><![CDATA[
<div id="shared_pane2" ajxpClass="AjxpPane" class="tabbed_editor">
<div class="title-flex">
- <h3 class="dashboard_panel_title">AJXP_MESSAGE[share_center.98]</h3>
+ <h3 class="dashboard_panel_title">AJXP_MESSAGE[share_center.98]<div class="legend">AJXP_MESSAGE[share_center.99]</div></h3>
<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"shared_files_list","toolbarsList":["share_list_toolbar-selection", "share_list_toolbar"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
</div>
<div id="shared_files_list" ajxpClass="FetchedResultPane" ajxpOptions='{"displayMode":"list", "fixedDisplayMode":"list", "groupByData":"1", "fit":"height","selectionChangeCallback":false,"updateGlobalContext":false,"nodeProviderProperties":{"get_action":"sharelist-load","user_context":"current"}}'></div>
@@ -30,7 +30,7 @@
<div class="title-flex">
<h3 class="dashboard_panel_title">
AJXP_MESSAGE[keystore.1]
- <div style="font-size: 12px;font-weight: 300;line-height: 1.3em;margin-top: 3px;">AJXP_MESSAGE[keystore.2]</div>
+ <div class="legend">AJXP_MESSAGE[keystore.2]</div>
</h3>
<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"toolbarsList":["keystore_bar"]}'></div>
</div>
@@ -124,7 +124,7 @@
paneInfo='{"type":"widget"}'><![CDATA[
<div id="team_pane" ajxpClass="AjxpPane" ajxpOptions='{"fit":"height"}'>
<div class="title-flex">
- <h3 class="dashboard_panel_title">AJXP_MESSAGE[user_dash.50]</h3>
+ <h3 class="dashboard_panel_title">AJXP_MESSAGE[user_dash.50]<div class="legend">AJXP_MESSAGE[user_dash.51]</div></h3>
<div id="buttons_bar" class="action_bar" ajxpClass="ActionsToolbar" ajxpOptions='{"dataModelElementId":"team_panel","toolbarsList":["team_address_book"],"skipBubbling":true, "skipCarousel":true,"submenuOffsetTop":2}'></div>
</div>
<div id="team_panel" ajxpClass="FetchedResultPane" ajxpOptions='{"updateGlobalContext":false,"nodeProviderProperties":{"get_action":"ls","dir":"teams"}}' class="tabbed_editor display_metadata"></div>
@@ -1,3 +1,6 @@
+#role_edit_box {
+ /* ORBIT THEME */
+}
#role_edit_box div#meta_source_button_add {
margin-top: 20px;
}
@@ -8,7 +11,7 @@
border-right: 1px solid #bbbbbb;
line-height: initial;
}
-#role_edit_box .ajxp_theme_orbit div.tabbed_editor {
+#role_edit_box div.tabbed_editor {
background-color: #f8f8f8;
border: 0;
}
@@ -350,41 +353,40 @@
margin: 0 10px;
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.15);
}
-.ajxp_theme_orbit .innerContainer {
+.ajxp_theme_orbit #role_edit_box .innerContainer {
border: 0;
box-shadow: none;
}
-.ajxp_theme_orbit #metaTabulator .innerContainer {
+.ajxp_theme_orbit #role_edit_box #metaTabulator .innerContainer {
background-color: transparent;
margin: 0 !important;
padding: 10px !important;
padding-bottom: 20px !important;
}
-.ajxp_theme_orbit .innerTabRow {
+.ajxp_theme_orbit #role_edit_box .innerTabRow {
border-radius: 0;
margin: 0;
box-shadow: none;
}
-/* ORBIT THEME */
-.ajxp_theme_orbit div.tabbed_editor input[type="text"],
-.ajxp_theme_orbit div.tabbed_editor input[type="password"] {
+.ajxp_theme_orbit #role_edit_box div.tabbed_editor input[type="text"],
+.ajxp_theme_orbit #role_edit_box div.tabbed_editor input[type="password"] {
width: inherit !important;
}
-.ajxp_theme_orbit div.tabbed_editor div.chosen-search input[type="text"] {
+.ajxp_theme_orbit #role_edit_box div.tabbed_editor div.chosen-search input[type="text"] {
width: 100% !important;
padding: 4px 20px 4px 5px !important;
border-radius: 2px;
}
-.ajxp_theme_orbit div#parameters-selected span.list_remove_item {
+.ajxp_theme_orbit #role_edit_box div#parameters-selected span.list_remove_item {
top: 42px;
left: 400px;
right: inherit;
}
-.ajxp_theme_orbit div#account_actions {
+.ajxp_theme_orbit #role_edit_box div#account_actions {
text-align: left;
padding: 12px 40px 18px;
}
-.ajxp_theme_orbit div.meta_plugin_new_form {
+.ajxp_theme_orbit #role_edit_box div.meta_plugin_new_form {
background-color: white;
margin: 8px 0 0 2%;
border-radius: 5px;
@@ -393,13 +395,13 @@
max-width: 447px;
width: 93%;
}
-.ajxp_theme_orbit div.meta_plugin_new_form.empty {
+.ajxp_theme_orbit #role_edit_box div.meta_plugin_new_form.empty {
display: none;
}
-.ajxp_theme_orbit div.meta_source_new_empty_params {
+.ajxp_theme_orbit #role_edit_box div.meta_source_new_empty_params {
margin: 11px 11px 0;
font-style: italic;
}
-.ajxp_theme_orbit div#parameters-selected {
+.ajxp_theme_orbit #role_edit_box div#parameters-selected {
border-radius: 0 !important;
}
@@ -10,7 +10,7 @@
border-right: 1px solid #bbbbbb;
line-height: initial;
}
- .ajxp_theme_orbit div.tabbed_editor{
+ div.tabbed_editor{
background-color: #f8f8f8;
border: 0;
}
@@ -428,69 +428,74 @@
margin: 0 10px;
box-shadow: 0px 1px 1px rgba(0,0,0,0.15);
}
-}
-.ajxp_theme_orbit .innerContainer{
- border: 0;
- box-shadow: none;
-}
+ /* ORBIT THEME */
+ .ajxp_theme_orbit &{
-.ajxp_theme_orbit #metaTabulator .innerContainer{
- background-color: transparent;
- margin: 0 !important;
- padding: 10px !important;
- padding-bottom: 20px !important;
+ .innerContainer{
+ border: 0;
+ box-shadow: none;
+ }
-}
+ #metaTabulator .innerContainer{
+ background-color: transparent;
+ margin: 0 !important;
+ padding: 10px !important;
+ padding-bottom: 20px !important;
-.ajxp_theme_orbit .innerTabRow{
- border-radius: 0;
- margin: 0;
- box-shadow: none;
-}
+ }
-/* ORBIT THEME */
+ .innerTabRow{
+ border-radius: 0;
+ margin: 0;
+ box-shadow: none;
+ }
-.ajxp_theme_orbit div.tabbed_editor input[type="text"],
-.ajxp_theme_orbit div.tabbed_editor input[type="password"]{
- width: inherit !important;
-}
+ div.tabbed_editor input[type="text"],
+ div.tabbed_editor input[type="password"]{
+ width: inherit !important;
+ }
-.ajxp_theme_orbit div.tabbed_editor div.chosen-search input[type="text"]{
- width: 100% !important;
- padding: 4px 20px 4px 5px !important;
- border-radius: 2px;
-}
+ div.tabbed_editor div.chosen-search input[type="text"]{
+ width: 100% !important;
+ padding: 4px 20px 4px 5px !important;
+ border-radius: 2px;
+ }
-.ajxp_theme_orbit div#parameters-selected span.list_remove_item {
- top: 42px;
- left: 400px;
- right: inherit;
-}
+ div#parameters-selected span.list_remove_item {
+ top: 42px;
+ left: 400px;
+ right: inherit;
+ }
-.ajxp_theme_orbit div#account_actions {
- text-align: left;
- padding: 12px 40px 18px;
-}
+ div#account_actions {
+ text-align: left;
+ padding: 12px 40px 18px;
+ }
+
+ div.meta_plugin_new_form{
+ background-color: white;
+ margin: 8px 0 0 2%;
+ border-radius: 5px;
+ padding: 0 1% 10px;
+ border: 1px solid #C8CCD3;
+ max-width: 447px;
+ width: 93%;
+ }
-.ajxp_theme_orbit div.meta_plugin_new_form{
- background-color: white;
- margin: 8px 0 0 2%;
- border-radius: 5px;
- padding: 0 1% 10px;
- border: 1px solid #C8CCD3;
- max-width: 447px;
- width: 93%;
-}
+ div.meta_plugin_new_form.empty{
+ display: none;
+ }
-.ajxp_theme_orbit div.meta_plugin_new_form.empty{
- display: none;
-}
+ div.meta_source_new_empty_params {
+ margin: 11px 11px 0;
+ font-style: italic;
+ }
+ div#parameters-selected{
+ border-radius: 0 !important;
+ }
+
+ }
-.ajxp_theme_orbit div.meta_source_new_empty_params {
- margin: 11px 11px 0;
- font-style: italic;
}
-.ajxp_theme_orbit div#parameters-selected{
- border-radius: 0 !important;
-}
+

0 comments on commit 5e3aea5

Please sign in to comment.