Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
5b6e2dd5
Commit
5b6e2dd5
authored
Dec 20, 2016
by
alisan617
Committed by
GitHub
Dec 20, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14173 from edx/alisan/discussion-styles-fix-TNL-6187
new inline discussion style fixes
parents
30c84118
e28f42b1
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
57 additions
and
7 deletions
+57
-7
lms/static/js/Markdown.Editor.js
+2
-1
lms/static/sass/discussion/_discussion.scss
+2
-1
lms/static/sass/discussion/_mixins.scss
+1
-0
lms/static/sass/discussion/elements/_actions.scss
+1
-1
lms/static/sass/discussion/elements/_editor.scss
+38
-0
lms/static/sass/discussion/utilities/_variables-v1.scss
+4
-0
lms/static/sass/discussion/utilities/_variables-v2.scss
+4
-0
lms/static/sass/discussion/views/_inline.scss
+2
-2
lms/static/sass/discussion/views/_thread.scss
+3
-2
No files found.
lms/static/js/Markdown.Editor.js
View file @
5b6e2dd5
...
...
@@ -26,7 +26,7 @@
// The text that appears on the dialog box when entering links.
var
linkDialogText
=
gettext
(
'Insert Hyperlink'
),
linkUrlHelpText
=
gettext
(
"e.g. 'http://google.com
/
'"
),
linkUrlHelpText
=
gettext
(
"e.g. 'http://google.com'"
),
linkDestinationLabel
=
gettext
(
'Link Description'
),
linkDestinationHelpText
=
gettext
(
"e.g. 'google'"
),
linkDestinationError
=
gettext
(
'Please provide a description of the link destination.'
),
...
...
@@ -1108,6 +1108,7 @@
imageIsDecorativeLabel
:
imageIsDecorativeLabel
,
imageUploadHandler
:
imageUploadHandler
});
dialog
.
setAttribute
(
'dir'
,
doc
.
head
.
getAttribute
(
'dir'
));
dialog
.
setAttribute
(
'role'
,
'dialog'
);
dialog
.
setAttribute
(
'tabindex'
,
'-1'
);
dialog
.
setAttribute
(
'aria-labelledby'
,
'editorDialogTitle'
);
...
...
lms/static/sass/discussion/_discussion.scss
View file @
5b6e2dd5
...
...
@@ -19,7 +19,8 @@
.discussion-article
{
position
:
relative
;
a
{
a
,
p
{
word-wrap
:
break-word
;
}
}
...
...
lms/static/sass/discussion/_mixins.scss
View file @
5b6e2dd5
...
...
@@ -98,4 +98,5 @@
background
:
$color
;
font-style
:
normal
;
color
:
white
;
white-space
:
nowrap
;
}
lms/static/sass/discussion/elements/_actions.scss
View file @
5b6e2dd5
...
...
@@ -58,7 +58,7 @@
position
:
absolute
;
top
:
100%
;
pointer-events
:
none
;
min-width
:
(
$baseline
*
6
.5
)
;
min-width
:
$actions-dropdown-width
;
&
.is-expanded
{
display
:
block
;
...
...
lms/static/sass/discussion/elements/_editor.scss
View file @
5b6e2dd5
...
...
@@ -139,6 +139,44 @@
>
form
>
input
[
type
=
"file"
]
{
margin-bottom
:
18px
;
}
.field-group
.field
.field-hint
{
@include
margin-left
(
0
);
width
:
100%
;
}
.field-input-label
{
font-size
:
$forum-base-font-size
;
}
.input-text
{
width
:
calc
(
100%
-
175px
);
// minus choose file button width
height
:
40px
;
// align with choose file button
&
.has-error
{
border-color
:
$forum-color-error
;
}
}
.field-message.has-error
{
width
:
calc
(
100%
-
175px
);
// align with input-text
background-color
:
$forum-color-error
;
color
:
$white
;
padding
:
$baseline
/
2
;
box-sizing
:
border-box
;
}
.field-label
{
cursor
:
pointer
;
}
.input-checkbox
{
@include
margin-right
(
$baseline
/
5
);
}
#new-url-input
{
direction
:
ltr
;
// http url is always English
}
}
.wmd-button-row
{
...
...
lms/static/sass/discussion/utilities/_variables-v1.scss
View file @
5b6e2dd5
...
...
@@ -35,6 +35,10 @@ $post-image-dimension: ($baseline*3) !default; // image size + margin
$response-image-dimension
:
(
$baseline
*
2
.5
)
!
default
;
// image size + margin
$comment-image-dimension
:
(
$baseline
*
2
)
!
default
;
// image size + margin
// action-dropdown
$actions-dropdown-width
:
145px
;
// best estimate in RU
$actions-dropdown-offset
:
100px
;
// actions dropdown expanded more menu
// font sizes
$forum-base-font-size
:
14px
;
$forum-x-large-font-size
:
21px
;
...
...
lms/static/sass/discussion/utilities/_variables-v2.scss
View file @
5b6e2dd5
...
...
@@ -35,6 +35,10 @@ $post-image-dimension: ($baseline*3) !default; // image size + margin
$response-image-dimension
:
(
$baseline
*
2
.5
)
!
default
;
// image size + margin
$comment-image-dimension
:
(
$baseline
*
2
)
!
default
;
// image size + margin
// action-dropdown
$actions-dropdown-width
:
145px
;
// best estimate in RU
$actions-dropdown-offset
:
100px
;
// actions dropdown expanded more menu
// font sizes
$forum-base-font-size
:
font-size
(
small
);
$forum-x-large-font-size
:
font-size
(
x-large
);
...
...
lms/static/sass/discussion/views/_inline.scss
View file @
5b6e2dd5
...
...
@@ -12,15 +12,15 @@
border-radius
:
$forum-border-radius
;
.forum-nav-bar
{
padding
:
(
$baseline
/
2
)
(
$baseline
/
4
);
color
:
$forum-color-navigation-bar
;
padding
:
(
$baseline
/
2
)
$baseline
;
position
:
relative
;
.all-posts-btn
{
color
:
$forum-color-primary
;
.icon
{
@include
margin-left
(
-15px
);
@include
margin-left
(
$baseline
/
2
);
}
}
}
...
...
lms/static/sass/discussion/views/_thread.scss
View file @
5b6e2dd5
...
...
@@ -141,7 +141,7 @@
}
.discussion-response
.response-body
{
@include
padding
((
$baseline
/
2
)
,
$baseline
,
0
,
0
);
//ensures content doesn't overlap on post or response actions.
@include
padding
((
$baseline
/
2
)
,
(
$baseline
*
1
.5
)
,
0
,
0
);
//ensures content doesn't overlap on post or response actions.
margin-bottom
:
0
.2em
;
font-size
:
$forum-base-font-size
;
}
...
...
@@ -151,7 +151,7 @@
@include
clearfix
();
.post-header-content
{
max-width
:
calc
(
100%
-
100px
);
max-width
:
calc
(
100%
-
#{
$actions-dropdown-offset
}
);
// post title
.post-title
{
...
...
@@ -164,6 +164,7 @@
.post-body
{
@extend
%t-copy-sub1
;
padding
:
(
$baseline
/
2
)
0
;
max-width
:
calc
(
100%
-
#{
$actions-dropdown-offset
}
);
}
// post context
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment