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.

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

ui enhancements for color picker and report abuse (addition to #980) #1024

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 10 additions & 14 deletions docs/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -327,37 +327,33 @@ header {
font-size: 1rem;
background-color: var(--primaryColor);
border-radius: 0.2em;
border: 2px solid var(--grey);
border: 1px solid var(--grey);
transform: translate(0, -30%);
padding: 0.5em;
padding-top: 0;
padding: 1em;
margin-left: 1em;
font-weight: normal;
z-index: 1;
display: none;
}

.colorPickerMenuCloseBtn {
color: red;
font-weight: bold;
margin-top: 0;
margin-right: 0.25em;
display: flex;
flex-direction: row-reverse;
-webkit-box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.3);
box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.3);
}

.colorPickerMenuCloseBtn > span:hover {
cursor: pointer;
}

.colorPickerResetBtn {
.colorPickerBtn {
margin: auto;
margin-top: 0.5em;
display: block;
width: min-content;
background-color: var(--primaryColor);
border-radius: 1em;
border: 1px solid var(--grey);
display: inline-block;
}

.colorPickerBtn:hover {
background-color: var(--grey);
}

.checkerboardInput {
Expand Down
18 changes: 9 additions & 9 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,16 @@ <h4>
<span>
<img src="./assets/img/color_wheel.png" class='colorPicker' ng-click="toggleColorPickerMenu('fontColorPickerMenu')">
<span class='colorPickerMenu' id='fontColorPickerMenu'>
<div class='colorPickerMenuCloseBtn'><span ng-click="toggleColorPickerMenu('fontColorPickerMenu')">X</span></div>
<div>
<input type='color' value='#60be86' ng-model="fontBackground">
Background Color
</div>
<div>
<input type='checkbox' class='checkerboardInput' ng-model="fontDisplayCheckerboard">
<label for='checkboardInput' >Checkerboard</label>
<input type='checkbox' id='checkboardInputFont' class='checkerboardInput' ng-model="fontDisplayCheckerboard">
<label for='checkboardInputFont' >Checkerboard</label>
</div>
<button class='colorPickerResetBtn' ng-click="fontBackground = DEFAULT_BACKGROUND">Reset</button>
<button class='colorPickerBtn' ng-click="toggleColorPickerMenu('fontColorPickerMenu')">Close</button>
<button class='colorPickerBtn' ng-click="fontBackground = DEFAULT_BACKGROUND; fontDisplayCheckerboard=0; toggleColorPickerMenu('fontColorPickerMenu')">Reset</button>
</span>
</span>
</h4>
Expand Down Expand Up @@ -121,16 +121,16 @@ <h4>
<span>
<img src="./assets/img/color_wheel.png" class='colorPicker' ng-click="toggleColorPickerMenu('svgColorPickerMenu')">
<span class='colorPickerMenu' id='svgColorPickerMenu'>
<div class='colorPickerMenuCloseBtn'><span ng-click="toggleColorPickerMenu('svgColorPickerMenu')">X</span></div>
<div>
<input type='color' value='#60be86' ng-model="svgBackground">
Background Color
</div>
<div>
<input type='checkbox' class='checkerboardInput' ng-model="svgDisplayCheckerboard">
<label for='checkboardInput' >Checkerboard</label>
<input type='checkbox' id='checkboardInputSvg' class='checkerboardInput' ng-model="svgDisplayCheckerboard">
<label for='checkboardInputSvg' >Checkerboard</label>
</div>
<button class='colorPickerResetBtn' ng-click="svgBackground = DEFAULT_BACKGROUND">Reset</button>
<button class='colorPickerBtn' ng-click="toggleColorPickerMenu('svgColorPickerMenu')">Close</button>
<button class='colorPickerBtn' ng-click="svgBackground = DEFAULT_BACKGROUND; svgDisplayCheckerboard=0; toggleColorPickerMenu('svgColorPickerMenu')">Reset</button>
</span>
</span>
</h4>
Expand Down Expand Up @@ -186,7 +186,7 @@ <h5>If you prefer a local install, you can download all the files on the GitHub
</p>

<h3>Contact</h3>
<h5>If you have any legal concerns regarding copyrights, please reach out to us at <b><a>info@devicon.dev</a></b>. Any code/logo contributions should be made through our GitHub repository listed above.</h5>
<h5>If you have any legal concerns regarding copyrights or want to report an abuse, please reach out to us at <b><a href="mailto:info@devicon.dev">info@devicon.dev</a></b>. Any code/logo contributions should be made through our GitHub repository listed above.</h5>

<footer>
Originally created by <a href="https://github.com/konpa">Konpa</a> (under <a href="https://github.com/devicons/devicon/blob/master/LICENSE">MIT License</a>) and <br />
Expand Down