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

style: changed the design of creator tag in profile #916

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

style: changed the design of creator tag in profile #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7b4356a
initial
brrkrmn Oct 2, 2023
e71fa87
Merge branch 'master' of https://github.com/brrkrmn/zubhub
brrkrmn Oct 2, 2023
7cc40a0
Merge branch 'master' of https://github.com/brrkrmn/zubhub
brrkrmn Oct 3, 2023
e816669
Merge branch 'master' of https://github.com/brrkrmn/zubhub
brrkrmn Oct 4, 2023
190845f
Merge branch 'master' of https://github.com/brrkrmn/zubhub
brrkrmn Oct 6, 2023
46ce0cc
Merge branch 'unstructuredstudio:master' into master
brrkrmn Oct 7, 2023
3456907
revert package-lock.json
brrkrmn Oct 8, 2023
5860b72
fix package-lock.json
brrkrmn Oct 8, 2023
b296107
fix package-lock.json
brrkrmn Oct 8, 2023
3d23661
Merge branch 'unstructuredstudio:master' into master
brrkrmn Oct 11, 2023
0977d50
Merge branch 'unstructuredstudio:master' into master
brrkrmn Oct 13, 2023
6677139
Merge branch 'unstructuredstudio:master' into master
brrkrmn Oct 16, 2023
2e5a19d
Merge branch 'unstructuredstudio:master' into master
brrkrmn Oct 17, 2023
1f7a1b3
changed tag style of profile and team
brrkrmn Oct 17, 2023
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
6 changes: 3 additions & 3 deletions zubhub_frontend/zubhub/src/assets/js/styles/views/profile/profileStyles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { fade } from '@material-ui/core/styles';
import { colors } from "../../../colors";

const styles = theme => ({
root: {
Expand Down Expand Up @@ -91,9 +92,8 @@ const styles = theme => ({
marginBottom: '0.1em'
},
baseTagStyle: {
backgroundColor: '#00B8C4',
borderRadius: '50px',
color: 'white',
color: colors.primary,
fontWeight: '500',
padding: '0 0.5em',
marginLeft: '0.4em',
marginBottom: '0.4em',
Expand Down
2 changes: 1 addition & 1 deletion zubhub_frontend/zubhub/src/views/profile/Profile.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ function Profile(props) {
{sortTags(profile.tags).map(tag => (
<Typography
key={tag}
className={clsx(common_classes.baseTagStyle, {
className={clsx(classes.baseTagStyle, {
[common_classes.extendedTagStyle]: !isBaseTag(tag),
})}
component="h2"
Expand Down
Loading