Skip to content

Commit

Permalink
Merge pull request #43 from datopian/ui/requirements-new
Browse files Browse the repository at this point in the history
Feedbacks and pending requirements
  • Loading branch information
sneha-sharma12 committed Apr 22, 2024
2 parents 45a7f9f + b84358e commit 06fc257
Show file tree
Hide file tree
Showing 39 changed files with 773 additions and 348 deletions.
77 changes: 61 additions & 16 deletions ckanext/ubdc/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4323,7 +4323,7 @@ tbody.collapse.in {
.nav > li > a {
position: relative;
display: block;
padding: 10px 15px;
padding: 10px 15px 10px 0px;
}
.nav > li > a:hover, .nav > li > a:focus {
text-decoration: none;
Expand Down Expand Up @@ -4362,7 +4362,7 @@ tbody.collapse.in {
.nav-tabs > li > a {
margin-right: 2px;
line-height: 1.428571429;
border: 1px solid transparent;
border: none;
border-radius: 4px 4px 0 0;
color: #000;
}
Expand Down Expand Up @@ -7284,8 +7284,8 @@ a.tag:hover {
padding: 30px;
}
.module-content .add-to-group .btn-primary {
margin-top: 10px;
margin-bottom: 30px;
margin-top: 20px;
margin-bottom: 10px;
}

.module:first-child .module-heading {
Expand Down Expand Up @@ -7488,7 +7488,7 @@ a.tag:hover {
float: left;
width: 100%;
padding: 7.5px;
margin: 0 0 15px 15px;
margin: 0;
background-color: white;
display: flex;
border: 1px solid #ccc;
Expand All @@ -7497,11 +7497,32 @@ a.tag:hover {
.media-item .thumb, .module-item .thumb {
max-width: fit-content;
height: 15rem;
display: flex;
justify-content: center;
align-items: center;
overflow: hidden;
}
.media-item .thumb img, .module-item .thumb img {
height: 140px;
width: 235px;
object-fit: cover;
min-width: 100%;
min-height: 100%;
overflow: hidden;
object-fit: fill;
max-width: fit-content;
}
.media-item .thumb-org, .module-item .thumb-org {
max-width: fit-content;
height: 15rem;
display: flex;
justify-content: center;
align-items: center;
overflow: auto;
}
.media-item .thumb-org img, .module-item .thumb-org img {
min-width: 100%;
height: 100%;
overflow: hidden;
object-fit: fill;
max-width: fit-content;
}
.media-item .stats, .module-item .stats {
padding: 0px 10px;
Expand Down Expand Up @@ -7681,8 +7702,8 @@ a.tag:hover {
}

.nav-aside {
border-top: 1px dotted #DDD;
border-bottom: 1px dotted #DDD;
border-top: 1px dotted #ddd;
border-bottom: 1px dotted #ddd;
margin-bottom: 15px;
}

Expand All @@ -7694,6 +7715,10 @@ a.tag:hover {
margin: -7px -25px;
padding: 7px 25px;
}
.nav-item > a .badge,
.nav-aside li a .badge {
margin-right: 10px;
}

.nav-item > a > span.item-label {
text-transform: capitalize;
Expand All @@ -7708,7 +7733,7 @@ a.tag:hover {
.nav-aside li.active a {
position: relative;
color: #fff;
background-color: #647a82;
background-color: #f37021;
}

@media (min-width: 768px) {
Expand All @@ -7718,7 +7743,7 @@ a.tag:hover {
position: absolute;
border: 20px solid transparent;
border-right: none;
border-left-color: #647a82;
border-left-color: #f37021;
border-left-width: 6px;
top: 0;
bottom: 0;
Expand Down Expand Up @@ -7848,7 +7873,7 @@ a.tag:hover {
}
.nav-facet-tertiary .module-footer a {
font-weight: normal;
color: #8C8C8C;
color: #8c8c8c;
}
.nav-facet-tertiary .nav {
margin-bottom: 0;
Expand Down Expand Up @@ -8788,6 +8813,10 @@ select[data-module=autocomplete] {
margin-right: 0;
}

.additional-info-font {
font-family: "JetBrains Mono";
}

.additional-info td,
.additional-info th {
width: 50%;
Expand Down Expand Up @@ -9008,6 +9037,23 @@ td.diff_header {
margin-bottom: 15px;
}

.resource_metadata {
margin: 0 0 10px 0;
}

.dataset-title {
display: flex;
justify-content: space-between;
}
.dataset-title h1 {
font-size: 26px;
margin: 0 0 10px 0;
}

.non-transparent-primary {
background-color: #f37021 !important;
}

.search-form {
margin-bottom: 20px;
padding-bottom: 25px;
Expand Down Expand Up @@ -9283,7 +9329,7 @@ td.diff_header {
.page-header .content_action {
float: right;
margin-top: -3px;
padding: 10px 15px;
padding: 5px 15px;
}

.no-nav .page-header {
Expand Down Expand Up @@ -9878,7 +9924,6 @@ h4 small {
.module-heading .fa:last-child,
.btn .fa:last-child {
margin-right: 3px;
display: none;
}

.wrapper {
Expand Down Expand Up @@ -11677,7 +11722,7 @@ br.line-height2 {
}

.access-request-container {
display: flex;
display: block;
justify-content: flex-end;
margin: 10px;
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
121 changes: 121 additions & 0 deletions ckanext/ubdc/public/base/fonts/stylesheet.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,124 @@
font-weight: 700; /* Bold */
font-style: normal; /* Normal */
}



/* JetBrains Mono Bold */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-Bold.ttf') format('truetype');
font-weight: bold;
}

/* JetBrains Mono Bold Italic */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-BoldItalic.ttf') format('truetype');
font-weight: bold;
font-style: italic;
}

/* JetBrains Mono ExtraBold */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-ExtraBold.ttf') format('truetype');
font-weight: 800;
}

/* JetBrains Mono ExtraBold Italic */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-ExtraBoldItalic.ttf') format('truetype');
font-weight: 800;
font-style: italic;
}

/* JetBrains Mono ExtraLight */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-ExtraLight.ttf') format('truetype');
font-weight: 200;
}

/* JetBrains Mono ExtraLight Italic */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-ExtraLightItalic.ttf') format('truetype');
font-weight: 200;
font-style: italic;
}

/* JetBrains Mono Italic */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-Italic.ttf') format('truetype');
font-style: italic;
}

/* JetBrains Mono Light */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-Light.ttf') format('truetype');
font-weight: 300;
}

/* JetBrains Mono Light Italic */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-LightItalic.ttf') format('truetype');
font-weight: 300;
font-style: italic;
}

/* JetBrains Mono Medium */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-Medium.ttf') format('truetype');
font-weight: 500;
}

/* JetBrains Mono Medium Italic */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-MediumItalic.ttf') format('truetype');
font-weight: 500;
font-style: italic;
}

/* JetBrains Mono Regular */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-Regular.ttf') format('truetype');
}

/* JetBrains Mono SemiBold */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-SemiBold.ttf') format('truetype');
font-weight: 600;
}

/* JetBrains Mono SemiBold Italic */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-SemiBoldItalic.ttf') format('truetype');
font-weight: 600;
font-style: italic;
}

/* JetBrains Mono Thin */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-Thin.ttf') format('truetype');
font-weight: 100;
}

/* JetBrains Mono Thin Italic */
@font-face {
font-family: 'JetBrains Mono';
src: url('JetBrainsMono/JetBrainsMono-ThinItalic.ttf') format('truetype');
font-weight: 100;
font-style: italic;
}

4 changes: 2 additions & 2 deletions ckanext/ubdc/public/base/scss/_access_request.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
}

.access-request-container {
display: flex;
display: block;
justify-content: flex-end;
margin: 10px;
a {
font-size: 14px;
}
}
}
2 changes: 1 addition & 1 deletion ckanext/ubdc/public/base/scss/_bootstrap-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ $navbar-inverse-toggle-border-color: #333;
//##

//=== Shared nav styles
$nav-link-padding: 10px 15px;
$nav-link-padding: 10px 15px 10px 0px;
$nav-link-hover-bg: $gray-lighter;

$nav-disabled-link-color: $gray-light;
Expand Down
20 changes: 20 additions & 0 deletions ckanext/ubdc/public/base/scss/_dataset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@
}

// Additional Info
.additional-info-font {
font-family: "JetBrains Mono";
}
.additional-info td,
.additional-info th {
width: 50%;
Expand Down Expand Up @@ -417,3 +420,20 @@ td.diff_header {
float: right;
margin-bottom: 15px;
}

.resource_metadata {
margin: 0 0 10px 0;
}

.dataset-title {
display: flex;
justify-content: space-between;
h1 {
font-size: 26px;
margin: 0 0 10px 0;
}
}

.non-transparent-primary {
background-color: $brandPrimary !important;
}
2 changes: 1 addition & 1 deletion ckanext/ubdc/public/base/scss/_icons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ $icon-position: (
.fa {
&:last-child {
margin-right: 3px;
display: none;
// display: none;
}
}
}
Loading

0 comments on commit 06fc257

Please sign in to comment.