From d94586cf96c7f7fe85dff0b7c90aa1b17d9919d9 Mon Sep 17 00:00:00 2001 From: Ramesh Kumar <r.kumar@redkarma.eu> Date: Thu, 3 Sep 2020 15:35:01 +0530 Subject: [PATCH] TMSS-297: Updated style and class names --- SAS/TMSS/frontend/tmss_webapp/src/App.css | 4 ++++ .../tmss_webapp/src/layout/_overrides.scss | 11 ---------- .../src/layout/components/PageHeader.js | 8 ++++---- .../tmss_webapp/src/layout/sass/_layout.scss | 1 + .../src/layout/sass/_pageheader.scss | 20 +++++++++++++++++++ 5 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_pageheader.scss diff --git a/SAS/TMSS/frontend/tmss_webapp/src/App.css b/SAS/TMSS/frontend/tmss_webapp/src/App.css index 766fff47baa..e3e9f72165b 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/App.css +++ b/SAS/TMSS/frontend/tmss_webapp/src/App.css @@ -53,6 +53,10 @@ a{ margin-bottom: 10px; } +.main-content { + margin-top:20px; +} + .main-content span,a{ font-size: 14px; } diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss index 87a69cd8d25..0fd0c0c45c8 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/_overrides.scss @@ -23,14 +23,3 @@ border-top: none; } } -.app-header { - display: flex; - justify-content: space-between; - align-items: baseline; -} -.app-header .app-header-name { - margin-bottom: 0; -} -.app-header .app-header-actions i { - margin-left: 20px; -} \ No newline at end of file diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js index 3ff67bc1c8b..2d7f62f9894 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/components/PageHeader.js @@ -22,12 +22,12 @@ export default ({ title, subTitle, actions, ...props}) => { }; return ( - <div className="app-header"> + <div className="page-header"> <div className="title"> - <h2 className="app-header-name">{title || page.title}</h2> - {(page.subTitle || subTitle) && <h6 className="app-header-subtitle">{subTitle || page.subTitle}</h6>} + <h2 className="page-title">{title || page.title}</h2> + {(page.subTitle || subTitle) && <h6 className="page-subtitle">{subTitle || page.subTitle}</h6>} </div> - <div className="app-header-actions"> + <div className="page-action-menu"> {(actions || []).map(action => { return ( <Link to={{ ...action.props }} title={action.title || ''} onClick={() => onClickLink(action)}> diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss index 79f22ea1071..7f1c64219e8 100644 --- a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_layout.scss @@ -12,3 +12,4 @@ @import "./_dashboard"; @import "./_breadcrumb"; @import "./_viewtable"; +@import "./_pageheader"; diff --git a/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_pageheader.scss b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_pageheader.scss new file mode 100644 index 00000000000..fd360e6aaae --- /dev/null +++ b/SAS/TMSS/frontend/tmss_webapp/src/layout/sass/_pageheader.scss @@ -0,0 +1,20 @@ +.page-header { + display: flex; + justify-content: space-between; + align-items: baseline; + border-bottom: 1px solid #e0e0e0; + margin-bottom: 10px; + padding-bottom: 5px; +} +.page-title { + margin-bottom: 0; +} +.page-subtitle { + color: #b4b2b2; + font-size: 100%; + font-weight: 400; + margin-bottom: 0px; +} +.page-action-menu i { + margin-left: 5px; +} \ No newline at end of file -- GitLab