Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add big screen variable and refactor code #89

Merged
merged 2 commits into from
Jun 11, 2024
Merged

fix: add big screen variable and refactor code #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a1124d
fix: add big-screen variiable
hinakhadim Jun 11, 2024
9568a58
v17.4.2
hinakhadim Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ instructions, because git commits are used to generate release notes:

<!-- scriv-insert-here -->

<a id='changelog-17.4.2'></a>
## v17.4.2 (2024-06-11)

- [BugFix] Add big screen variable of screen responsiveness (by @tanveer65)

<a id='changelog-17.4.1'></a>
## v17.4.1 (2024-06-10)

Expand Down
2 changes: 1 addition & 1 deletion tutorindigo/__about__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "17.4.1"
__version__ = "17.4.2"
2 changes: 1 addition & 1 deletion tutorindigo/templates/indigo/lms/static/sass/courseware/_bookmarks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
h3 {
font-size: 18px;
font-weight: 600;
color: $drak;
color: $dark;
.icon {
width: 12px;
height: 12px;
Expand Down
0 ...o/lms/static/sass/dashbord/_dashbord.scss → ...lms/static/sass/dashboard/_dashboard.scss
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions tutorindigo/templates/indigo/lms/static/sass/extra/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ footer.tutor-container {
line-height: 24px;
}
a {
color: $light-drak;
color: $light-dark;
text-decoration: none;
&:hover {
color: $drak;
color: $dark;
text-decoration: none;
}
}
Expand All @@ -95,6 +95,6 @@ footer.tutor-container {
display: block;
font-size: 12px;
line-height: 16px;
color: $light-drak;
color: $light-dark;
}
}
12 changes: 6 additions & 6 deletions tutorindigo/templates/indigo/lms/static/sass/extra/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ header.global-header {
font-weight: 500;
line-height: 22px;
padding: 20px 0;
color: $light-drak;
color: $light-dark;
margin: 0 16px 0 0;
border-bottom: 2px solid transparent;
&.active, &:hover {
color: $drak;
color: $dark;
border-bottom: 2px solid $primary;
}
}
Expand Down Expand Up @@ -102,10 +102,10 @@ header.global-header {
padding: 10px;
font-size: 14px;
line-height: 20px;
color: $light-drak;
color: $light-dark;
&:hover {
background: $primary-light;
color: $drak; ;
color: $dark; ;
}
}
}
Expand Down Expand Up @@ -143,11 +143,11 @@ header.global-header {
padding: 16px;
font-size: 14px;
line-height: 20px;
color: $light-drak;
color: $light-dark;
border: none;
&:hover, &.active {
background: $primary-light;
color: $drak;
color: $dark;
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ nav.wrapper-preview-menu {
line-height: 34px;
margin: 0 0 12px;
text-align: left;
color: $drak;
color: $dark;
}
p {
margin: 0 0 20px;
Expand Down Expand Up @@ -295,13 +295,13 @@ body.view-statictab, body.view-instructordash, body.view-teams, body.view-wiki {
border-width: 2px;
font-size: 14px;
font-weight: 500;
color: $light-drak;
color: $light-dark;
&:hover, &:visited {
color: $drak;
color: $dark;
border-color: transparent;
}
&.active {
color: $drak;
color: $dark;
border-color: $primary;
}
}
Expand Down Expand Up @@ -385,7 +385,7 @@ body.view-instructordash {
color: white !important;
}
&:hover {
color: $drak;
color: $dark;
}
}
}
Expand Down Expand Up @@ -417,12 +417,12 @@ body.view-instructordash {
margin: 0 0 30px;
h4 {
font-size: 18px;
color: $drak;
color: $dark;
font-weight: 600;
span {
font-size: 14px;
font-weight: normal;
color: $light-drak;
color: $light-dark;
}
}
}
Expand Down Expand Up @@ -620,7 +620,7 @@ body.view-wiki{

@import '../../../extra/footer';
@import '../../../extra/header';
@import '../../../dashbord/dashbord';
@import '../../../dashboard/dashboard';
@import '../../../courseware/discover';
@import '../../../courseware/about';
@import '../../../courseware/bookmarks';
Expand Down
64 changes: 0 additions & 64 deletions tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,3 @@
// SansSerif
@font-face {
font-family: 'Plex';
src: url('#{$static-path}/fonts/IBMPlexSans-Light.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}

@font-face {
font-family: 'Plex';
src:
url('#{$static-path}/fonts/IBMPlexSans-LightItalic.ttf') format('truetype');
font-weight: 300;
font-style: italic;
}

@font-face {
font-family: 'Plex';
src:
url('#{$static-path}/fonts/IBMPlexSans-Regular.ttf') format('truetype');
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: 'Plex';
src:
url('#{$static-path}/fonts/IBMPlexSans-Italic.ttf') format('truetype');
font-weight: 400;
font-style: italic;
}

@font-face {
font-family: 'Plex';
src:
url('#{$static-path}/fonts/IBMPlexSans-SemiBold.ttf') format('truetype');
font-weight: 600;
font-style: normal;
}

@font-face {
font-family: 'Plex';
src:
url('#{$static-path}/fonts/IBMPlexSans-SemiBoldItalic.ttf') format('truetype');
font-weight: 600;
font-style: italic;
}

@font-face {
font-family: 'Plex';
src:
url('#{$static-path}/fonts/IBMPlexSans-Bold.ttf') format('truetype');
font-weight: 700;
font-style: normal;
}

@font-face {
font-family: 'Plex';
src:
url('#{$static-path}/fonts/IBMPlexSans-BoldItalic.ttf') format('truetype');
font-weight: 700;
font-style: italic;
}

///////// Serif
@font-face {
font-family: 'Crimson';
Expand Down
8 changes: 6 additions & 2 deletions tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@ $f-sans-serif: Crimson, 'Open Sans','Helvetica Neue', Helvetica, Arial, sans-ser
// Initialize the Open edX Bootstrap theme
@import 'edx-bootstrap/sass/open-edx/theme';

$drak: #111827;
$light-drak: #374151;

// Introducing new variables

$dark: #111827;
$light-dark: #374151;
$big-screen: 1200px;
Loading